diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 874ec60a..ec9dc817 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -99,7 +99,7 @@ android:enabled="true" android:excludeFromRecents="true" android:exported="false" - android:icon="@drawable/copy" + android:icon="@drawable/ic_action_copy" android:label="@string/activity_share_to_clipboard" android:noHistory="false"> diff --git a/mobile/res/drawable-hdpi/action_about.png b/mobile/res/drawable-hdpi/action_about.png deleted file mode 100644 index 6eaf08ae..00000000 Binary files a/mobile/res/drawable-hdpi/action_about.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/action_search.png b/mobile/res/drawable-hdpi/action_search.png deleted file mode 100644 index f12e005e..00000000 Binary files a/mobile/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/action_settings.png b/mobile/res/drawable-hdpi/action_settings.png deleted file mode 100644 index 3e4580e0..00000000 Binary files a/mobile/res/drawable-hdpi/action_settings.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/alerts_and_states_warning.png b/mobile/res/drawable-hdpi/alerts_and_states_warning.png deleted file mode 100644 index 1fefdd8b..00000000 Binary files a/mobile/res/drawable-hdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/av_full_screen.png b/mobile/res/drawable-hdpi/av_full_screen.png deleted file mode 100644 index 52601b03..00000000 Binary files a/mobile/res/drawable-hdpi/av_full_screen.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/browser.png b/mobile/res/drawable-hdpi/browser.png deleted file mode 100644 index e154afdb..00000000 Binary files a/mobile/res/drawable-hdpi/browser.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/collections_view_as_list.png b/mobile/res/drawable-hdpi/collections_view_as_list.png deleted file mode 100644 index e45ea1fd..00000000 Binary files a/mobile/res/drawable-hdpi/collections_view_as_list.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/content_remove.png b/mobile/res/drawable-hdpi/content_remove.png deleted file mode 100644 index 094eea58..00000000 Binary files a/mobile/res/drawable-hdpi/content_remove.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/copy.png b/mobile/res/drawable-hdpi/copy.png deleted file mode 100644 index 623b7150..00000000 Binary files a/mobile/res/drawable-hdpi/copy.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/device_access_location_found.png b/mobile/res/drawable-hdpi/device_access_location_found.png deleted file mode 100644 index d7fae7e9..00000000 Binary files a/mobile/res/drawable-hdpi/device_access_location_found.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/drawer_shadow.9.png b/mobile/res/drawable-hdpi/drawer_shadow.9.png deleted file mode 100644 index 224cc4ff..00000000 Binary files a/mobile/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/ic_action_about.png b/mobile/res/drawable-hdpi/ic_action_about.png new file mode 100644 index 00000000..b1f14062 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_about.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_add_to_queue.png b/mobile/res/drawable-hdpi/ic_action_add_to_queue.png new file mode 100644 index 00000000..ecebce71 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_add_to_queue.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_cc_bcc.png b/mobile/res/drawable-hdpi/ic_action_cc_bcc.png new file mode 100644 index 00000000..3c6eb02b Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_cc_bcc.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_copy.png b/mobile/res/drawable-hdpi/ic_action_copy.png new file mode 100644 index 00000000..f97df1d5 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_copy.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_error.png b/mobile/res/drawable-hdpi/ic_action_error.png new file mode 100644 index 00000000..7837289c Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_error.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_full_screen.png b/mobile/res/drawable-hdpi/ic_action_full_screen.png new file mode 100644 index 00000000..22f30d31 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_full_screen.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_group.png b/mobile/res/drawable-hdpi/ic_action_group.png new file mode 100644 index 00000000..d043de6c Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_group.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_location_found.png b/mobile/res/drawable-hdpi/ic_action_location_found.png new file mode 100644 index 00000000..4748e901 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_location_found.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_map.png b/mobile/res/drawable-hdpi/ic_action_map.png new file mode 100644 index 00000000..945cf8ce Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_map.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_refresh.png b/mobile/res/drawable-hdpi/ic_action_refresh.png new file mode 100644 index 00000000..00d70792 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_refresh.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_search.png b/mobile/res/drawable-hdpi/ic_action_search.png new file mode 100644 index 00000000..a70393b5 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_search.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_settings.png b/mobile/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 00000000..f50c2d3a Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_settings.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_share.png b/mobile/res/drawable-hdpi/ic_action_share.png new file mode 100644 index 00000000..d52b66ab Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_share.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_view_as_list.png b/mobile/res/drawable-hdpi/ic_action_view_as_list.png new file mode 100644 index 00000000..07fde4ac Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_view_as_list.png differ diff --git a/mobile/res/drawable-hdpi/collections_view_as_list_compact.png b/mobile/res/drawable-hdpi/ic_action_view_as_list_compact.png similarity index 100% rename from mobile/res/drawable-hdpi/collections_view_as_list_compact.png rename to mobile/res/drawable-hdpi/ic_action_view_as_list_compact.png diff --git a/mobile/res/drawable-hdpi/ic_action_warning.png b/mobile/res/drawable-hdpi/ic_action_warning.png new file mode 100644 index 00000000..12f9dd4b Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_warning.png differ diff --git a/mobile/res/drawable-hdpi/ic_action_web_site.png b/mobile/res/drawable-hdpi/ic_action_web_site.png new file mode 100644 index 00000000..8c4add42 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_web_site.png differ diff --git a/mobile/res/drawable-hdpi/ic_debug.png b/mobile/res/drawable-hdpi/ic_debug.png deleted file mode 100644 index 8ed186b4..00000000 Binary files a/mobile/res/drawable-hdpi/ic_debug.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/ic_drawer.png b/mobile/res/drawable-hdpi/ic_drawer.png index ff7b1def..6614ea4f 100644 Binary files a/mobile/res/drawable-hdpi/ic_drawer.png and b/mobile/res/drawable-hdpi/ic_drawer.png differ diff --git a/mobile/res/drawable-hdpi/ic_layer_chooser.png b/mobile/res/drawable-hdpi/ic_layer_chooser.png deleted file mode 100644 index b03e2f34..00000000 Binary files a/mobile/res/drawable-hdpi/ic_layer_chooser.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/location_map.png b/mobile/res/drawable-hdpi/location_map.png deleted file mode 100644 index e5907072..00000000 Binary files a/mobile/res/drawable-hdpi/location_map.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/navigation_refresh.png b/mobile/res/drawable-hdpi/navigation_refresh.png deleted file mode 100644 index bb9d855f..00000000 Binary files a/mobile/res/drawable-hdpi/navigation_refresh.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/share.png b/mobile/res/drawable-hdpi/share.png deleted file mode 100644 index c329f58d..00000000 Binary files a/mobile/res/drawable-hdpi/share.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/social_cc_bcc.png b/mobile/res/drawable-hdpi/social_cc_bcc.png deleted file mode 100644 index 8c4f8b31..00000000 Binary files a/mobile/res/drawable-hdpi/social_cc_bcc.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/social_group.png b/mobile/res/drawable-hdpi/social_group.png deleted file mode 100644 index dbf88a85..00000000 Binary files a/mobile/res/drawable-hdpi/social_group.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/action_about.png b/mobile/res/drawable-mdpi/action_about.png deleted file mode 100644 index d7b7e698..00000000 Binary files a/mobile/res/drawable-mdpi/action_about.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/action_search.png b/mobile/res/drawable-mdpi/action_search.png deleted file mode 100644 index 587d9e0b..00000000 Binary files a/mobile/res/drawable-mdpi/action_search.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/action_settings.png b/mobile/res/drawable-mdpi/action_settings.png deleted file mode 100644 index d3e42edc..00000000 Binary files a/mobile/res/drawable-mdpi/action_settings.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/alerts_and_states_warning.png b/mobile/res/drawable-mdpi/alerts_and_states_warning.png deleted file mode 100644 index a39f97d4..00000000 Binary files a/mobile/res/drawable-mdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/av_full_screen.png b/mobile/res/drawable-mdpi/av_full_screen.png deleted file mode 100644 index 6fdcd5fc..00000000 Binary files a/mobile/res/drawable-mdpi/av_full_screen.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/browser.png b/mobile/res/drawable-mdpi/browser.png deleted file mode 100644 index 41b56ec9..00000000 Binary files a/mobile/res/drawable-mdpi/browser.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/collections_view_as_list.png b/mobile/res/drawable-mdpi/collections_view_as_list.png deleted file mode 100644 index 9c748b0b..00000000 Binary files a/mobile/res/drawable-mdpi/collections_view_as_list.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/content_remove.png b/mobile/res/drawable-mdpi/content_remove.png deleted file mode 100644 index 3336760d..00000000 Binary files a/mobile/res/drawable-mdpi/content_remove.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/copy.png b/mobile/res/drawable-mdpi/copy.png deleted file mode 100644 index efb2445f..00000000 Binary files a/mobile/res/drawable-mdpi/copy.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/device_access_location_found.png b/mobile/res/drawable-mdpi/device_access_location_found.png deleted file mode 100644 index 9d1f4403..00000000 Binary files a/mobile/res/drawable-mdpi/device_access_location_found.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/drawer_shadow.9.png b/mobile/res/drawable-mdpi/drawer_shadow.9.png deleted file mode 100644 index 3797f99c..00000000 Binary files a/mobile/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/ic_action_about.png b/mobile/res/drawable-mdpi/ic_action_about.png new file mode 100644 index 00000000..7ede67d8 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_about.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_add_to_queue.png b/mobile/res/drawable-mdpi/ic_action_add_to_queue.png new file mode 100644 index 00000000..1262bcf5 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_add_to_queue.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_cc_bcc.png b/mobile/res/drawable-mdpi/ic_action_cc_bcc.png new file mode 100644 index 00000000..8e6d3ce9 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_cc_bcc.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_copy.png b/mobile/res/drawable-mdpi/ic_action_copy.png new file mode 100644 index 00000000..507b1391 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_copy.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_error.png b/mobile/res/drawable-mdpi/ic_action_error.png new file mode 100644 index 00000000..57274d77 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_error.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_full_screen.png b/mobile/res/drawable-mdpi/ic_action_full_screen.png new file mode 100644 index 00000000..e4a9ff0a Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_full_screen.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_group.png b/mobile/res/drawable-mdpi/ic_action_group.png new file mode 100644 index 00000000..fa3a4399 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_group.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_location_found.png b/mobile/res/drawable-mdpi/ic_action_location_found.png new file mode 100644 index 00000000..9251ee49 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_location_found.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_map.png b/mobile/res/drawable-mdpi/ic_action_map.png new file mode 100644 index 00000000..8ce5f3d5 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_map.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_refresh.png b/mobile/res/drawable-mdpi/ic_action_refresh.png new file mode 100644 index 00000000..c2920a7a Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_refresh.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_search.png b/mobile/res/drawable-mdpi/ic_action_search.png new file mode 100644 index 00000000..4edb1ff9 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_search.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_settings.png b/mobile/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 00000000..04f61dea Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_settings.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_share.png b/mobile/res/drawable-mdpi/ic_action_share.png new file mode 100644 index 00000000..cce0ab97 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_share.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_view_as_list.png b/mobile/res/drawable-mdpi/ic_action_view_as_list.png new file mode 100644 index 00000000..ccb4c7d7 Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_view_as_list.png differ diff --git a/mobile/res/drawable-mdpi/collections_view_as_list_compact.png b/mobile/res/drawable-mdpi/ic_action_view_as_list_compact.png similarity index 100% rename from mobile/res/drawable-mdpi/collections_view_as_list_compact.png rename to mobile/res/drawable-mdpi/ic_action_view_as_list_compact.png diff --git a/mobile/res/drawable-mdpi/ic_action_warning.png b/mobile/res/drawable-mdpi/ic_action_warning.png new file mode 100644 index 00000000..9a04694a Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_warning.png differ diff --git a/mobile/res/drawable-mdpi/ic_action_web_site.png b/mobile/res/drawable-mdpi/ic_action_web_site.png new file mode 100644 index 00000000..c073fa5e Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_web_site.png differ diff --git a/mobile/res/drawable-mdpi/ic_debug.png b/mobile/res/drawable-mdpi/ic_debug.png deleted file mode 100644 index ac20ea13..00000000 Binary files a/mobile/res/drawable-mdpi/ic_debug.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/ic_drawer.png b/mobile/res/drawable-mdpi/ic_drawer.png index fb681ba2..b05c026c 100644 Binary files a/mobile/res/drawable-mdpi/ic_drawer.png and b/mobile/res/drawable-mdpi/ic_drawer.png differ diff --git a/mobile/res/drawable-mdpi/ic_layer_chooser.png b/mobile/res/drawable-mdpi/ic_layer_chooser.png deleted file mode 100644 index 8ba65bd8..00000000 Binary files a/mobile/res/drawable-mdpi/ic_layer_chooser.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/location_map.png b/mobile/res/drawable-mdpi/location_map.png deleted file mode 100644 index 21de2011..00000000 Binary files a/mobile/res/drawable-mdpi/location_map.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/navigation_refresh.png b/mobile/res/drawable-mdpi/navigation_refresh.png deleted file mode 100644 index bd611e8e..00000000 Binary files a/mobile/res/drawable-mdpi/navigation_refresh.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/share.png b/mobile/res/drawable-mdpi/share.png deleted file mode 100644 index 056deb57..00000000 Binary files a/mobile/res/drawable-mdpi/share.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/social_cc_bcc.png b/mobile/res/drawable-mdpi/social_cc_bcc.png deleted file mode 100644 index 9ec127ed..00000000 Binary files a/mobile/res/drawable-mdpi/social_cc_bcc.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/social_group.png b/mobile/res/drawable-mdpi/social_group.png deleted file mode 100644 index a19796c3..00000000 Binary files a/mobile/res/drawable-mdpi/social_group.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/action_about.png b/mobile/res/drawable-xhdpi/action_about.png deleted file mode 100644 index 4ee903f0..00000000 Binary files a/mobile/res/drawable-xhdpi/action_about.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/action_search.png b/mobile/res/drawable-xhdpi/action_search.png deleted file mode 100644 index 3549f84d..00000000 Binary files a/mobile/res/drawable-xhdpi/action_search.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/action_settings.png b/mobile/res/drawable-xhdpi/action_settings.png deleted file mode 100644 index 09b01483..00000000 Binary files a/mobile/res/drawable-xhdpi/action_settings.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/alerts_and_states_warning.png b/mobile/res/drawable-xhdpi/alerts_and_states_warning.png deleted file mode 100644 index 4f11628f..00000000 Binary files a/mobile/res/drawable-xhdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/av_full_screen.png b/mobile/res/drawable-xhdpi/av_full_screen.png deleted file mode 100644 index 791240fd..00000000 Binary files a/mobile/res/drawable-xhdpi/av_full_screen.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/browser.png b/mobile/res/drawable-xhdpi/browser.png deleted file mode 100644 index 9b77be96..00000000 Binary files a/mobile/res/drawable-xhdpi/browser.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/collections_view_as_list.png b/mobile/res/drawable-xhdpi/collections_view_as_list.png deleted file mode 100644 index 95708234..00000000 Binary files a/mobile/res/drawable-xhdpi/collections_view_as_list.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/content_remove.png b/mobile/res/drawable-xhdpi/content_remove.png deleted file mode 100644 index f391760e..00000000 Binary files a/mobile/res/drawable-xhdpi/content_remove.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/copy.png b/mobile/res/drawable-xhdpi/copy.png deleted file mode 100644 index 00bff33c..00000000 Binary files a/mobile/res/drawable-xhdpi/copy.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/device_access_location_found.png b/mobile/res/drawable-xhdpi/device_access_location_found.png deleted file mode 100644 index 52ca8ab7..00000000 Binary files a/mobile/res/drawable-xhdpi/device_access_location_found.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/drawer_shadow.9.png b/mobile/res/drawable-xhdpi/drawer_shadow.9.png deleted file mode 100644 index fa3d853e..00000000 Binary files a/mobile/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/ic_action_about.png b/mobile/res/drawable-xhdpi/ic_action_about.png new file mode 100644 index 00000000..4536a8d1 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_about.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png b/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png new file mode 100644 index 00000000..8190ee04 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png b/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png new file mode 100644 index 00000000..124ddcb3 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_copy.png b/mobile/res/drawable-xhdpi/ic_action_copy.png new file mode 100644 index 00000000..4aa5778e Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_copy.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_error.png b/mobile/res/drawable-xhdpi/ic_action_error.png new file mode 100644 index 00000000..0933154a Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_error.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_full_screen.png b/mobile/res/drawable-xhdpi/ic_action_full_screen.png new file mode 100644 index 00000000..2c1df53b Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_full_screen.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_group.png b/mobile/res/drawable-xhdpi/ic_action_group.png new file mode 100644 index 00000000..7a6efaf6 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_group.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_location_found.png b/mobile/res/drawable-xhdpi/ic_action_location_found.png new file mode 100644 index 00000000..f5031892 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_location_found.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_map.png b/mobile/res/drawable-xhdpi/ic_action_map.png new file mode 100644 index 00000000..537c5a49 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_map.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_refresh.png b/mobile/res/drawable-xhdpi/ic_action_refresh.png new file mode 100644 index 00000000..6aa33d59 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_refresh.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_search.png b/mobile/res/drawable-xhdpi/ic_action_search.png new file mode 100644 index 00000000..19658e4a Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_search.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_settings.png b/mobile/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 00000000..3f2f394f Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_share.png b/mobile/res/drawable-xhdpi/ic_action_share.png new file mode 100644 index 00000000..40771e48 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_share.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_view_as_list.png b/mobile/res/drawable-xhdpi/ic_action_view_as_list.png new file mode 100644 index 00000000..45a3fc70 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_view_as_list.png differ diff --git a/mobile/res/drawable-xhdpi/collections_view_as_list_compact.png b/mobile/res/drawable-xhdpi/ic_action_view_as_list_compact.png similarity index 100% rename from mobile/res/drawable-xhdpi/collections_view_as_list_compact.png rename to mobile/res/drawable-xhdpi/ic_action_view_as_list_compact.png diff --git a/mobile/res/drawable-xhdpi/ic_action_warning.png b/mobile/res/drawable-xhdpi/ic_action_warning.png new file mode 100644 index 00000000..5cd44b97 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_warning.png differ diff --git a/mobile/res/drawable-xhdpi/ic_action_web_site.png b/mobile/res/drawable-xhdpi/ic_action_web_site.png new file mode 100644 index 00000000..2d759def Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_web_site.png differ diff --git a/mobile/res/drawable-xhdpi/ic_debug.png b/mobile/res/drawable-xhdpi/ic_debug.png deleted file mode 100644 index aeb96b06..00000000 Binary files a/mobile/res/drawable-xhdpi/ic_debug.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/ic_drawer.png b/mobile/res/drawable-xhdpi/ic_drawer.png index b9bc3d70..bcf49dd7 100644 Binary files a/mobile/res/drawable-xhdpi/ic_drawer.png and b/mobile/res/drawable-xhdpi/ic_drawer.png differ diff --git a/mobile/res/drawable-xhdpi/ic_layer_chooser.png b/mobile/res/drawable-xhdpi/ic_layer_chooser.png deleted file mode 100644 index 46089e5b..00000000 Binary files a/mobile/res/drawable-xhdpi/ic_layer_chooser.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/location_map.png b/mobile/res/drawable-xhdpi/location_map.png deleted file mode 100644 index f5ce90a3..00000000 Binary files a/mobile/res/drawable-xhdpi/location_map.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/navigation_refresh.png b/mobile/res/drawable-xhdpi/navigation_refresh.png deleted file mode 100644 index a7fdc0df..00000000 Binary files a/mobile/res/drawable-xhdpi/navigation_refresh.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/share.png b/mobile/res/drawable-xhdpi/share.png deleted file mode 100644 index 15549b04..00000000 Binary files a/mobile/res/drawable-xhdpi/share.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/social_cc_bcc.png b/mobile/res/drawable-xhdpi/social_cc_bcc.png deleted file mode 100644 index 4153807e..00000000 Binary files a/mobile/res/drawable-xhdpi/social_cc_bcc.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/social_group.png b/mobile/res/drawable-xhdpi/social_group.png deleted file mode 100644 index 32d24d2c..00000000 Binary files a/mobile/res/drawable-xhdpi/social_group.png and /dev/null differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_about.png b/mobile/res/drawable-xxhdpi/ic_action_about.png new file mode 100644 index 00000000..f3db0887 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_about.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png b/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png new file mode 100644 index 00000000..c30aade6 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png b/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png new file mode 100644 index 00000000..b66fd656 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_copy.png b/mobile/res/drawable-xxhdpi/ic_action_copy.png new file mode 100644 index 00000000..a381cdc3 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_copy.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_error.png b/mobile/res/drawable-xxhdpi/ic_action_error.png new file mode 100644 index 00000000..b8a6aaad Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_error.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_full_screen.png b/mobile/res/drawable-xxhdpi/ic_action_full_screen.png new file mode 100644 index 00000000..e8dff1e4 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_full_screen.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_group.png b/mobile/res/drawable-xxhdpi/ic_action_group.png new file mode 100644 index 00000000..9289b1c8 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_group.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_location_found.png b/mobile/res/drawable-xxhdpi/ic_action_location_found.png new file mode 100644 index 00000000..e5179540 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_location_found.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_map.png b/mobile/res/drawable-xxhdpi/ic_action_map.png new file mode 100644 index 00000000..ed72ce91 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_map.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_refresh.png b/mobile/res/drawable-xxhdpi/ic_action_refresh.png new file mode 100644 index 00000000..145c9df4 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_refresh.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_search.png b/mobile/res/drawable-xxhdpi/ic_action_search.png new file mode 100644 index 00000000..a1086388 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_search.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_settings.png b/mobile/res/drawable-xxhdpi/ic_action_settings.png new file mode 100644 index 00000000..6725c082 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_settings.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_share.png b/mobile/res/drawable-xxhdpi/ic_action_share.png new file mode 100644 index 00000000..22ed428f Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_share.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png b/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png new file mode 100644 index 00000000..46004164 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png b/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png new file mode 100644 index 00000000..d04f2c3e Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_warning.png b/mobile/res/drawable-xxhdpi/ic_action_warning.png new file mode 100644 index 00000000..b0ad5b2d Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_warning.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_action_web_site.png b/mobile/res/drawable-xxhdpi/ic_action_web_site.png new file mode 100644 index 00000000..e24eed75 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_web_site.png differ diff --git a/mobile/res/drawable-xxhdpi/ic_drawer.png b/mobile/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 00000000..f7e3b307 Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_drawer.png differ diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml index 941cd9bc..8ddb56e3 100644 --- a/mobile/res/menu/main.xml +++ b/mobile/res/menu/main.xml @@ -1,34 +1,34 @@ @@ -41,9 +41,9 @@ - \ No newline at end of file + diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 92bcc447..dfda5290 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -370,6 +370,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis // Pop last item from backstack and pretend the relevant menu item was clicked if (!mBackStack.isEmpty()) { backStackPop(); + mBackButtonPressed = true; return; } @@ -405,8 +406,10 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis // map pane is top-lvl. clear stack. if (pane == Pane.MAP) mBackStack.clear(); - else mBackStack.push(mCurrentPane); + // don't push current pane to backstack if this method was called via back button + else if (!mBackButtonPressed) mBackStack.push(mCurrentPane); + mBackButtonPressed = false; mCurrentPane = pane; mNavigationHelper.switchTo(pane); } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java index 0d15cc85..87224326 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java @@ -63,25 +63,25 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt int icon = 0; switch (item) { case MAP: - icon = R.drawable.location_map; + icon = R.drawable.ic_action_map; break; case INFO: - icon = R.drawable.action_about; + icon = R.drawable.ic_action_about; break; case FULL: - icon = R.drawable.collections_view_as_list; + icon = R.drawable.ic_action_view_as_list; break; case COMPACT: - icon = R.drawable.collections_view_as_list_compact; + icon = R.drawable.ic_action_view_as_list_compact; break; case PUBLIC: - icon = R.drawable.social_group; + icon = R.drawable.ic_action_group; break; case FACTION: - icon = R.drawable.social_cc_bcc; + icon = R.drawable.ic_action_cc_bcc; break; case DEBUG: - icon = R.drawable.ic_debug; + icon = R.drawable.ic_action_error; break; } diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java index 3ba21fa2..24523eeb 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java @@ -81,10 +81,10 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList String geoUri = "geo:" + mLl; Intent geoIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(geoUri)); intents.add(geoIntent); - addTab(intents, R.string.tab_map, R.drawable.location_map); + addTab(intents, R.string.tab_map, R.drawable.ic_action_map); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getUrl())); - addTab(intent, R.string.tab_browser, R.drawable.browser); + addTab(intent, R.string.tab_browser, R.drawable.ic_action_web_site); } private void setupShareIntent(String str) { @@ -93,7 +93,7 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList intent.setType("text/plain"); intent.putExtra(Intent.EXTRA_TEXT, str); intent.putExtra(Intent.EXTRA_SUBJECT, mTitle); - addTab(intent, R.string.tab_share, R.drawable.share); + addTab(intent, R.string.tab_share, R.drawable.ic_action_share); } @Override diff --git a/plugins/broken/ipas-link.user.js b/plugins/broken/ipas-link.user.js deleted file mode 100644 index 02db5180..00000000 --- a/plugins/broken/ipas-link.user.js +++ /dev/null @@ -1,111 +0,0 @@ -// ==UserScript== -// @id iitc-plugin-ipas-link@graphracer -// @name IITC Plugin: simulate an attack on portal -// @category Portal Info -// @version 0.2.0.@@DATETIMEVERSION@@ -// @namespace https://github.com/xosofox/IPAS -// @updateURL @@UPDATEURL@@ -// @downloadURL @@DOWNLOADURL@@ -// @description [@@BUILDNAME@@-@@BUILDDATE@@] Adds a link to the portal details to open the portal in IPAS - Ingress Portal Attack Simulator on http://ipas.graphracer.com -// @include https://www.ingress.com/intel* -// @include http://www.ingress.com/intel* -// @match https://www.ingress.com/intel* -// @match http://www.ingress.com/intel* -// @grant none -// ==/UserScript== - -@@PLUGINSTART@@ - -// PLUGIN START //////////////////////////////////////////////////////// - -// use own namespace for plugin -window.plugin.ipasLink = function() {}; - -window.plugin.ipasLink.setupCallback = function() { - addHook('portalDetailsUpdated', window.plugin.ipasLink.addLink); -} - -window.plugin.ipasLink.addLink = function(d) { - $('.linkdetails').append(''); -} - -window.plugin.ipasLink.getHash = function (d) { - var hashParts = []; - $.each(d.resonatorArray.resonators, function (ind, reso) { - if (reso) { - hashParts.push(reso.level + "," + reso.distanceToPortal + "," + reso.energyTotal); - } else { - hashParts.push("1,20,0"); - } - }); - var resos = hashParts.join(";"); - - hashParts = []; - $.each(d.portalV2.linkedModArray, function (ind, mod) { - // s - shields - // h - heat sink - // i - intentionally left in - // t - turret - // - // f - force amp - // m - multi-hack - // l - link-amp - // - var modCodes = { - "RES_SHIELD": "s", - "HEATSINK": "h", - "TURRET": "t", - "FORCE_AMP": "f", - "MULTIHACK": "m", - "LINK_AMPLIFIER": "l" - } - - var mc = "0"; - if (mod) { - if (mod.type in modCodes) { - mc = modCodes[mod.type] + mod.rarity.charAt(0).toLowerCase(); - - //special for shields to distinguish old/new mitigation - if (mod.type == "RES_SHIELD") { - mc += mod.stats.MITIGATION; - } - } - } - hashParts.push(mc); - }); - var shields = hashParts.join(","); - - var linkParts = []; - var edges = d.portalV2.linkedEdges; - - var portalL = new L.LatLng(d.locationE6.latE6 / 1E6, d.locationE6.lngE6 / 1E6) - $.each(edges, function (ind, edge) { - //calc distance in m here - var distance = 1; //default to 1m, so a low level portal would support it - - //Try to find other portals details - var guid = edge.otherPortalGuid - if (window.portals[guid] !== undefined) { - //get other portals details as o - var o = window.portals[guid].options.details; - var otherPortalL = new L.LatLng(o.locationE6.latE6 / 1E6, o.locationE6.lngE6 / 1E6); - var distance = Math.round(portalL.distanceTo(otherPortalL)); - } - - if (!(edge.isOrigin)) { - distance = distance * -1; - } - linkParts.push(distance); - }); - var links = linkParts.join(","); - - return resos + "/" + shields + "/" + links; //changed with IPAS 1.1 to / instead of | - } - -var setup = function () { - window.plugin.ipasLink.setupCallback(); -} - -// PLUGIN END ////////////////////////////////////////////////////////// - -@@PLUGINEND@@ diff --git a/plugins/broken/portals-list.user.js b/plugins/broken/portals-list.user.js deleted file mode 100644 index 2b439f92..00000000 --- a/plugins/broken/portals-list.user.js +++ /dev/null @@ -1,453 +0,0 @@ -// ==UserScript== -// @id iitc-plugin-portals-list@teo96 -// @name IITC plugin: show list of portals -// @category Info -// @version 0.0.18.@@DATETIMEVERSION@@ -// @namespace https://github.com/jonatkins/ingress-intel-total-conversion -// @updateURL @@UPDATEURL@@ -// @downloadURL @@DOWNLOADURL@@ -// @description [@@BUILDNAME@@-@@BUILDDATE@@] Display a sortable list of all visible portals with full details about the team, resonators, shields, etc. -// @include https://www.ingress.com/intel* -// @include http://www.ingress.com/intel* -// @match https://www.ingress.com/intel* -// @match http://www.ingress.com/intel* -// @grant none -// ==/UserScript== - -@@PLUGINSTART@@ - -// PLUGIN START //////////////////////////////////////////////////////// - -/* whatsnew -* 0.0.15: Add 'age' column to display how long each portal has been controlled by its current owner. -* 0.0.14: Add support to new mods (S:Shield - T:Turret - LA:Link Amp - H:Heat-sink - M:Multi-hack - FA:Force Amp) -* 0.0.12: Use dialog() instead of alert so the user can drag the box around -* 0.0.11: Add nominal energy column and # links, fix sort bug when opened even amounts of times, nits -* 0.0.10: Fixed persistent css problem with alert -* 0.0.9 : bugs hunt -* 0.0.8 : Aborted to avoid problems with Niantic (export portals informations as csv or kml file) -* 0.0.7 : more informations available via tooltips (who deployed, energy, ...), new E/AP column -* 0.0.6 : Add power charge information into a new column + bugfix -* 0.0.5 : Filter portals by clicking on 'All portals', 'Res Portals' or 'Enl Portals' -* 0.0.4 : Add link to portals name, one click to display full information in portal panel, double click to zoom on portal, hover to show address -* 0.0.3 : sorting ascending/descending and add numbers of portals by faction on top on table -* 0.0.2 : add sorting feature when click on header column -* 0.0.1 : initial release, show list of portals with level, team, resonators and shield information -* -* Display code inspired from @vita10gy's scoreboard plugin : iitc-plugin-scoreboard@vita10gy - https://github.com/breunigs/ingress-intel-total-conversion -* Portal link code from xelio - iitc: AP List - https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/ap-list.user.js -* -* todo : export as GPX, Open in Google Maps, more statistics in the header, what else ? -*/ - -// use own namespace for plugin -window.plugin.portalslist = function() {}; - -window.plugin.portalslist.listPortals = []; // structure : name, team, level, resonators = Array, Shields = Array, APgain, Age -window.plugin.portalslist.sortOrder=-1; -window.plugin.portalslist.enlP = 0; -window.plugin.portalslist.resP = 0; -window.plugin.portalslist.filter=0; - -//fill the listPortals array with portals avaliable on the map (level filtered portals will not appear in the table) -window.plugin.portalslist.getPortals = function() { - //filter : 0 = All, 1 = Res, 2 = Enl - //console.log('** getPortals'); - var retval=false; - - var displayBounds = map.getBounds(); - - window.plugin.portalslist.listPortals = []; - //get portals informations from IITC - $.each(window.portals, function(i, portal) { - // eliminate offscreen portals (selected, and in padding) - if(!displayBounds.contains(portal.getLatLng())) return true; - - retval=true; - var d = portal.options.details; - var name = d.portalV2.descriptiveText.TITLE; - var address = d.portalV2.descriptiveText.ADDRESS; - var img = getPortalImageUrl(d); - var team = portal.options.team; - var now = new Date(); - var now_ms = now.getTime();// + (now.getTimezoneOffset() * 60000); - var age_in_seconds = 0; - var age_string_long = 'This portal is not captured.'; - var age_string_short = 'n/a'; - if(portal.options.details.hasOwnProperty('captured') && portal.options.details.captured.hasOwnProperty('capturedTime')) { - var age_in_seconds = Math.floor((now_ms - portal.options.details.captured.capturedTime)/1000); - var age_string_long = window.plugin.portalslist.secondsToString(age_in_seconds, 'l'); - var age_string_short = window.plugin.portalslist.secondsToString(age_in_seconds, 's'); - } - - switch (team){ - case 1 : - window.plugin.portalslist.resP++; - break; - case 2 : - window.plugin.portalslist.enlP++; - break; - } - var level = getPortalLevel(d).toFixed(2); - var guid = portal.options.guid; - - - //get resonators informations - var resonators = []; // my local resonator array : reso level, reso deployed by, distance to portal, energy total, max - var energy = 0; - var maxenergy=0; - $.each(portal.options.details.resonatorArray.resonators, function(ind, reso) { - if(reso) { - resonators[ind] = [reso.level, window.getPlayerName(reso.ownerGuid), reso.distanceToPortal, reso.energyTotal, RESO_NRG[reso.level]]; - energy += reso.energyTotal; - maxenergy += RESO_NRG[reso.level]; - } else { resonators[ind] = [0,'',0,0,0]; } - }); - // Sort resonators array by resonator level - resonators.sort(function (a, b) {return b[0] - a[0]}); - - //get mods informations - var mods = []; - $.each(d.portalV2.linkedModArray, function(ind, mod) { - var modShortName=''; - if (mod) { - switch (mod.displayName) { - case 'Portal Shield': - modShortName = 'S'; - break; - case 'Force Amp': - modShortName = 'FA'; - break; - case 'Link Amp': - modShortName = 'LA'; - break; - case 'Heat Sink': - modShortName = 'H'; - break; - case 'Multi-hack': - modShortName = 'M'; - break; - case 'Turret': - modShortName = 'T'; - break; - default: - modShortName = ''; - break; - } - if (modShortName === '') { - mods[ind] = ['', '', '']; - } else { - if ((modShortName === 'S') && - ((mod.rarity=='COMMON' && mod.stats.MITIGATION == 6) || - (mod.rarity=='RARE' && mod.stats.MITIGATION == 8) || - (mod.rarity=='VERY_RARE' && mod.stats.MITIGATION == 10))) - modShortName=modShortName+'!'; - mods[ind] = [mod.rarity, getPlayerName(mod.installingUser), modShortName, mod.displayName]; - } - }else { mods[ind] = ['', '', '']; } - }); - - var APgain= getAttackApGain(d).enemyAp; - var thisPortal = {'portal': d, - 'name': name, - 'team': team, - 'level': level, - 'guid': guid, - 'resonators': resonators, - 'energyratio': maxenergy ? Math.floor(energy/maxenergy*100) : 0, - 'mods': mods, - 'APgain': APgain, - 'EAP': (energy/APgain).toFixed(2), - 'energy': energy, - 'maxenergy': maxenergy, - 'links': d.portalV2.linkedEdges.length, - 'lat': portal._latlng.lat, - 'lng': portal._latlng.lng, - 'address': address, - 'img': img, - 'age': age_in_seconds, - 'age_string_long': age_string_long, - 'age_string_short': age_string_short}; - window.plugin.portalslist.listPortals.push(thisPortal); - }); - - return retval; -} - -window.plugin.portalslist.displayPL = function() { - // debug tools - //var start = new Date().getTime(); - //console.log('***** Start ' + start); - - var html = ''; - window.plugin.portalslist.sortOrder=-1; - window.plugin.portalslist.enlP = 0; - window.plugin.portalslist.resP = 0; - - if (window.plugin.portalslist.getPortals()) { - html += window.plugin.portalslist.portalTable('level', window.plugin.portalslist.sortOrder,window.plugin.portalslist.filter); - } else { - html = '
Nothing to show!
'; - }; - - dialog({ - html: '
' + html + '
', - dialogClass: 'ui-dialog-portalslist', - title: 'Portal list: ' + window.plugin.portalslist.listPortals.length + ' ' + (window.plugin.portalslist.listPortals.length == 1 ? 'portal' : 'portals'), - id: 'portal-list', - width: 800 - }); - - //run the name resolving process - resolvePlayerNames(); - - //debug tools - //end = new Date().getTime(); - //console.log('***** end : ' + end + ' and Elapse : ' + (end - start)); -} - -window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) { - // sortOrder <0 ==> desc, >0 ==> asc, i use sortOrder * -1 to change the state - window.plugin.portalslist.filter=filter; - var portals=window.plugin.portalslist.listPortals; - - //Array sort - window.plugin.portalslist.listPortals.sort(function(a, b) { - var retVal = 0; - switch (sortBy) { - case 'names': - retVal = a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; - break; - case 'r1': - retVal = b.resonators[0][0] - a.resonators[0][0]; - if (retVal) - break; - case 'r2': - retVal = b.resonators[1][0] - a.resonators[1][0]; - if (retVal) - break; - case 'r3': - retVal = b.resonators[2][0] - a.resonators[2][0]; - if (retVal) - break; - case 'r4': - retVal = b.resonators[3][0] - a.resonators[3][0]; - if (retVal) - break; - case 'r5': - retVal = b.resonators[4][0] - a.resonators[4][0]; - if (retVal) - break; - case 'r6': - retVal = b.resonators[5][0] - a.resonators[5][0]; - if (retVal) - break; - case 'r7': - retVal = b.resonators[6][0] - a.resonators[6][0]; - if (retVal) - break; - case 'r8': - retVal = b.resonators[7][0] - a.resonators[7][0]; - break; - case 's1': - retVal = a.mods[0][2] > b.mods[0][2] ? -1 : 1; - break; - case 's2': - retVal = a.mods[1][2] > b.mods[1][2] ? -1 : 1; - break; - case 's3': - retVal = a.mods[2][2] > b.mods[2][2] ? -1 : 1; - break; - case 's4': - retVal = a.mods[3][2] > b.mods[3][2] ? -1 : 1; - break; - default: - retVal = b[sortBy] - a[sortBy]; - break; - } - if (sortOrder > 0) retVal = -retVal; //thx @jonatkins - return retVal; - }); - - var sort = window.plugin.portalslist.portalTableSort; - var html = window.plugin.portalslist.stats(); - html += '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + ''; - - - $.each(portals, function(ind, portal) { - - if (filter === 0 || filter === portal.team) { - html += '' - + '' - + '' - + ''; - - var mitigationDetails = getPortalMitigationDetails(portal.portal); - portal.mitigation = mitigationDetails.total + mitigationDetails.excess; - - var title; - var percent; - $.each([0, 1, 2, 3 ,4 ,5 ,6 ,7], function(ind, slot) { - percent = portal.resonators[slot][4] ? Math.floor(portal.resonators[slot][3]/portal.resonators[slot][4]*100) : 0; - title = 'title="owner: ' + portal.resonators[slot][1] + '
' - + 'energy: ' + portal.resonators[slot][3] + ' / ' + portal.resonators[slot][4] + ' (' + percent + '%)
' - + 'distance: ' + portal.resonators[slot][2] + 'm'; - - html += ''; - - }); - - html += '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + '' - + ''; - - html+= ''; - } - }); - html += '
PortalLevelTR1R2R3R4R5R6R7R8Energy%LinksM1M2M3M4Mit.AP GainE/APAge
' + window.plugin.portalslist.getPortalLink(portal.portal, portal.guid) + '' + portal.level + '' + portal.team + '' + portal.resonators[slot][0] + '' + prettyEnergy(portal.energy) + '' + portal.energyratio + '%' + portal.links + '' + portal.mods[0][2] + '' + portal.mods[1][2] + '' + portal.mods[2][2] + '' + portal.mods[3][2] + '' + portal.mitigation + '' + portal.APgain + '' + portal.EAP + '' + portal.age_string_short + '
'; - - html += '
Click on portals table headers to sort by that column. ' - + 'Click on All Portals, Resistance Portals, Enlightened Portals to filter
' - + 'Thanks to @vita10gy & @xelio for their IITC plugins who inspired me. A @teo96 production. Vive la Résistance !
'; - - window.plugin.portalslist.sortOrder = window.plugin.portalslist.sortOrder*-1; - return html; -} - -window.plugin.portalslist.stats = function(sortBy) { - //console.log('** stats'); - var html = '' - + '' - + '' - + '' - + '' - + '
All Portals : (click to filter)' + window.plugin.portalslist.listPortals.length + 'Resistance Portals : ' + window.plugin.portalslist.resP +' (' + Math.floor(window.plugin.portalslist.resP/window.plugin.portalslist.listPortals.length*100) + '%)Enlightened Portals : '+ window.plugin.portalslist.enlP +' (' + Math.floor(window.plugin.portalslist.enlP/window.plugin.portalslist.listPortals.length*100) + '%)
'; - return html; -} - -// A little helper function so the above isn't so messy -window.plugin.portalslist.portalTableSort = function(name, by) { - var retVal = 'data-sort="' + name + '"'; - if(name === by) { - retVal += ' class="sorted"'; - } - return retVal; -}; - -// portal link - single click: select portal -// double click: zoom to and select portal -// hover: show address -// code from getPortalLink function by xelio from iitc: AP List - https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/ap-list.user.js -window.plugin.portalslist.getPortalLink = function(portal,guid) { - - var latlng = [portal.locationE6.latE6/1E6, portal.locationE6.lngE6/1E6].join(); - var jsSingleClick = 'window.renderPortalDetails(\''+guid+'\');return false'; - var jsDoubleClick = 'window.zoomToAndShowPortal(\''+guid+'\', ['+latlng+']);return false'; - var perma = '/intel?latE6='+portal.locationE6.latE6+'&lngE6='+portal.locationE6.lngE6+'&z=17&pguid='+guid; - - //Use Jquery to create the link, which escape characters in TITLE and ADDRESS of portal - var a = $('',{ - "class": 'help', - text: portal.portalV2.descriptiveText.TITLE, - title: portal.portalV2.descriptiveText.ADDRESS, - href: perma, - onClick: jsSingleClick, - onDblClick: jsDoubleClick - })[0].outerHTML; - var div = '
'+a+'
'; - return div; -} - -// length can be "s" or "l" for "short" or "long" -window.plugin.portalslist.secondsToString = function(seconds, length) { - var numdays = Math.floor(seconds / 86400); - var numhours = Math.floor((seconds % 86400) / 3600); - var numminutes = Math.floor(((seconds % 86400) % 3600) / 60); - var numseconds = ((seconds % 86400) % 3600) % 60; - if(length === "l") { - return numdays + " days " + numhours + " hours " + numminutes + " minutes " + numseconds + " seconds"; - } else { - return numdays + "d" + numhours + "h"; - } -} - -var setup = function() { - $('#toolbox').append(' Portals list'); - $('head').append(''); - // Setup sorting - $(document).on('click.portalslist', '#portalslist table th', function() { - $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,window.plugin.portalslist.filter)); - }); - $(document).on('click.portalslist', '#portalslist .filterAll', function() { - $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,0)); - }); - $(document).on('click.portalslist', '#portalslist .filterRes', function() { - $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,1)); - }); - $(document).on('click.portalslist', '#portalslist .filterEnl', function() { - $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,2)); - }); -} - -// PLUGIN END ////////////////////////////////////////////////////////// - -@@PLUGINEND@@ diff --git a/plugins/ipas-link.user.js b/plugins/ipas-link.user.js index 06352f63..cab444d6 100644 --- a/plugins/ipas-link.user.js +++ b/plugins/ipas-link.user.js @@ -1,15 +1,114 @@ // ==UserScript== // @id iitc-plugin-ipas-link@graphracer // @name IITC Plugin: simulate an attack on portal -// @category Deleted -// @version 0.2.0.@@DATETIMEVERSION@@ +// @category Portal Info +// @version 0.2.1.@@DATETIMEVERSION@@ // @namespace https://github.com/xosofox/IPAS // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ -// @description PLUGIN CURRENTLY UNAVAILABLE +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Adds a link to the portal details to open the portal in IPAS - Ingress Portal Attack Simulator on http://ipas.graphracer.com // @include https://www.ingress.com/intel* // @include http://www.ingress.com/intel* // @match https://www.ingress.com/intel* // @match http://www.ingress.com/intel* // @grant none // ==/UserScript== + +@@PLUGINSTART@@ + +// PLUGIN START //////////////////////////////////////////////////////// + +// use own namespace for plugin +window.plugin.ipasLink = function() {}; + +window.plugin.ipasLink.setupCallback = function() { + addHook('portalDetailsUpdated', window.plugin.ipasLink.addLink); +} + +window.plugin.ipasLink.addLink = function(p) { + $('.linkdetails').append(''); +} + +window.plugin.ipasLink.getHash = function (p) { + var details = p.portalDetails; + + var hashParts = []; + $.each(details.resonatorArray.resonators, function (ind, reso) { + if (reso) + hashParts.push(reso.level + "," + reso.distanceToPortal + "," + reso.energyTotal); + else + hashParts.push("1,20,0"); + }); + var resos = hashParts.join(";"); + + hashParts = []; + $.each(details.portalV2.linkedModArray, function (ind, mod) { + // s - shields + // h - heat sink + // i - intentionally left in + // t - turret + // + // f - force amp + // m - multi-hack + // l - link-amp + // + var modCodes = { + "RES_SHIELD": "s", + "HEATSINK": "h", + "TURRET": "t", + "FORCE_AMP": "f", + "MULTIHACK": "m", + "LINK_AMPLIFIER": "l" + } + + var mc = "0"; + if (mod) { + if (mod.type in modCodes) { + mc = modCodes[mod.type] + mod.rarity.charAt(0).toLowerCase(); + + //special for shields to distinguish old/new mitigation + if (mod.type == "RES_SHIELD") + mc += mod.stats.MITIGATION; + } + } + hashParts.push(mc); + }); + var shields = hashParts.join(","); + + var linkParts = []; + var portalLL = p.portal.getLatLng(); + var edges = getPortalLinks(p.guid); + edges["in"].forEach(function (guid) { + //calc distance in m here + var distance = 1; //default to 1m, so a low level portal would support it + + //Try to find other portals details + var o = window.portals[guid]; + if (o) + distance = Math.round(portalLL.distanceTo(o.getLatLng())); + + linkParts.push(distance); + }); + edges["out"].forEach(function (guid) { + //calc distance in m here + var distance = 1; //default to 1m, so a low level portal would support it + + //Try to find other portals details + var o = window.portals[guid]; + if (o) + distance = Math.round(portalLL.distanceTo(o.getLatLng())); + + linkParts.push(-distance); // "-" to mark outgoing links + }); + var links = linkParts.join(","); + + return resos + "/" + shields + "/" + links; //changed with IPAS 1.1 to / instead of | +} + +var setup = function () { + window.plugin.ipasLink.setupCallback(); +} + +// PLUGIN END ////////////////////////////////////////////////////////// + +@@PLUGINEND@@ diff --git a/plugins/portals-list.user.js b/plugins/portals-list.user.js index 88bb636b..ce61c6a6 100644 --- a/plugins/portals-list.user.js +++ b/plugins/portals-list.user.js @@ -1,15 +1,264 @@ // ==UserScript== // @id iitc-plugin-portals-list@teo96 // @name IITC plugin: show list of portals -// @category Deleted -// @version 0.0.18.@@DATETIMEVERSION@@ +// @category Info +// @version 0.1.0.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ -// @description PLUGIN CURRENTLY UNAVAILABLE +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Display a sortable list of all visible portals with full details about the team, resonators, shields, etc. // @include https://www.ingress.com/intel* // @include http://www.ingress.com/intel* // @match https://www.ingress.com/intel* // @match http://www.ingress.com/intel* // @grant none // ==/UserScript== + +@@PLUGINSTART@@ + +// PLUGIN START //////////////////////////////////////////////////////// + + /* whatsnew + * 0.1.0 : Using the new data format + * 0.0.15: Add 'age' column to display how long each portal has been controlled by its current owner. + * 0.0.14: Add support to new mods (S:Shield - T:Turret - LA:Link Amp - H:Heat-sink - M:Multi-hack - FA:Force Amp) + * 0.0.12: Use dialog() instead of alert so the user can drag the box around + * 0.0.11: Add nominal energy column and # links, fix sort bug when opened even amounts of times, nits + * 0.0.10: Fixed persistent css problem with alert + * 0.0.9 : bugs hunt + * 0.0.8 : Aborted to avoid problems with Niantic (export portals informations as csv or kml file) + * 0.0.7 : more informations available via tooltips (who deployed, energy, ...), new E/AP column + * 0.0.6 : Add power charge information into a new column + bugfix + * 0.0.5 : Filter portals by clicking on 'All portals', 'Res Portals' or 'Enl Portals' + * 0.0.4 : Add link to portals name, one click to display full information in portal panel, double click to zoom on portal, hover to show address + * 0.0.3 : sorting ascending/descending and add numbers of portals by faction on top on table + * 0.0.2 : add sorting feature when click on header column + * 0.0.1 : initial release, show list of portals with level, team, resonators and shield information + * + * Display code inspired from @vita10gy's scoreboard plugin : iitc-plugin-scoreboard@vita10gy - https://github.com/breunigs/ingress-intel-total-conversion + * Portal link code from xelio - iitc: AP List - https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/ap-list.user.js + * + * todo : export as GPX, Open in Google Maps, more statistics in the header, what else ? + */ + +// use own namespace for plugin +window.plugin.portalslist = function() {}; + +window.plugin.portalslist.listPortals = []; +window.plugin.portalslist.sortOrder=-1; +window.plugin.portalslist.enlP = 0; +window.plugin.portalslist.resP = 0; +window.plugin.portalslist.filter=0; + +//fill the listPortals array with portals avaliable on the map (level filtered portals will not appear in the table) +window.plugin.portalslist.getPortals = function() { + //filter : 0 = All, 1 = Res, 2 = Enl + var retval=false; + + var displayBounds = map.getBounds(); + + window.plugin.portalslist.listPortals = []; + $.each(window.portals, function(i, portal) { + // eliminate offscreen portals (selected, and in padding) + if(!displayBounds.contains(portal.getLatLng())) return true; + + retval=true; + var d = portal.options.data; + var teamN = window.TEAM_NONE; + + switch (d.team){ + case 'RESISTANCE' : + window.plugin.portalslist.resP++; + teamN = window.TEAM_RES + break; + case 'ENLIGHTENED' : + window.plugin.portalslist.enlP++; + teamN = window.TEAM_ENL; + break; + } + var l = window.getPortalLinks(i); + var f = window.getPortalFields(i); + + var thisPortal = { + 'portal': portal, + 'guid': i, + 'teamN': teamN, + 'name': d.title, + 'team': d.team, + 'level': portal.options.level, + 'health': d.health, + 'resCount': d.resCount, + 'img': d.img, + 'linkCount': l.in.length + l.out.length, + 'link' : l, + 'fieldCount': f.length, + 'field' : f + }; + window.plugin.portalslist.listPortals.push(thisPortal); + }); + + return retval; +} + +window.plugin.portalslist.displayPL = function() { + var html = ''; + window.plugin.portalslist.sortOrder=-1; + window.plugin.portalslist.enlP = 0; + window.plugin.portalslist.resP = 0; + + if (window.plugin.portalslist.getPortals()) { + html += window.plugin.portalslist.portalTable('level', window.plugin.portalslist.sortOrder,window.plugin.portalslist.filter); + } else { + html = '
Nothing to show!
'; + }; + + dialog({ + html: '
' + html + '
', + dialogClass: 'ui-dialog-portalslist', + title: 'Portal list: ' + window.plugin.portalslist.listPortals.length + ' ' + (window.plugin.portalslist.listPortals.length == 1 ? 'portal' : 'portals'), + id: 'portal-list', + width: 700 + }); + + //run the name resolving process + //resolvePlayerNames(); +} + +window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) { + // sortOrder <0 ==> desc, >0 ==> asc, i use sortOrder * -1 to change the state + window.plugin.portalslist.filter=filter; + var portals=window.plugin.portalslist.listPortals; + + //Array sort + window.plugin.portalslist.listPortals.sort(function(a, b) { + var retVal = 0; + switch (sortBy) { + case 'names': + retVal = a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; + break; + default: + retVal = b[sortBy] - a[sortBy]; + break; + } + if (sortOrder > 0) retVal = -retVal; //thx @jonatkins + return retVal; + }); + + var sort = window.plugin.portalslist.portalTableSort; + var html = window.plugin.portalslist.stats(); + html += '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + + $.each(portals, function(ind, portal) { + if (filter === TEAM_NONE || filter === portal.teamN) { + html += '' + + '' + + '' + + ''; + + html += '' + + '' + + '' + + ''; + + html+= ''; + } + }); + html += '
PortalLevelTeamHealthResonator CountLink CountField Count
' + window.plugin.portalslist.getPortalLink(portal, portal.guid) + '' + portal.level + '' + portal.team + '' + portal.health + '' + portal.resCount + '' + portal.linkCount + '' + portal.fieldCount + '
'; + + html += '
Click on portals table headers to sort by that column. ' + + 'Click on All Portals, Resistance Portals, Enlightened Portals to filter
' + + 'Thanks to @vita10gy & @xelio for their IITC plugins who inspired me. A @teo96 production. Vive la Résistance !
'; + + window.plugin.portalslist.sortOrder = window.plugin.portalslist.sortOrder*-1; + return html; +} + +window.plugin.portalslist.stats = function(sortBy) { + var html = '' + + '' + + '' + + '' + + '' + + '
All Portals : (click to filter)' + window.plugin.portalslist.listPortals.length + 'Resistance Portals : ' + window.plugin.portalslist.resP +' (' + Math.floor(window.plugin.portalslist.resP/window.plugin.portalslist.listPortals.length*100) + '%)Enlightened Portals : '+ window.plugin.portalslist.enlP +' (' + Math.floor(window.plugin.portalslist.enlP/window.plugin.portalslist.listPortals.length*100) + '%)
'; + return html; +} + +// A little helper function so the above isn't so messy +window.plugin.portalslist.portalTableSort = function(name, by) { + var retVal = 'data-sort="' + name + '"'; + if(name === by) { + retVal += ' class="sorted"'; + } + return retVal; +}; + +// portal link - single click: select portal +// double click: zoom to and select portal +// hover: show address +// code from getPortalLink function by xelio from iitc: AP List - https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/ap-list.user.js +window.plugin.portalslist.getPortalLink = function(portal,guid) { + var coord = portal.portal.getLatLng(); + var latlng = [coord.lat, coord.lng].join(); + var jsSingleClick = 'window.renderPortalDetails(\''+guid+'\');return false'; + var jsDoubleClick = 'window.zoomToAndShowPortal(\''+guid+'\', ['+latlng+']);return false'; + var perma = '/intel?latE6='+coord.lat+'&lngE6='+coord.lng+'&z=17&pguid='+guid; + + //Use Jquery to create the link, which escape characters in TITLE and ADDRESS of portal + var a = $('',{ + "class": 'help', + text: portal.name, + title: portal.name, + href: perma, + onClick: jsSingleClick, + onDblClick: jsDoubleClick + })[0].outerHTML; + var div = '
'+a+'
'; + return div; +} + +var setup = function() { + $('#toolbox').append(' Portals list'); + $('head').append(''); + // Setup sorting + $(document).on('click.portalslist', '#portalslist table th', function() { + $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,window.plugin.portalslist.filter)); + }); + $(document).on('click.portalslist', '#portalslist .filterAll', function() { + $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,0)); + }); + $(document).on('click.portalslist', '#portalslist .filterRes', function() { + $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,1)); + }); + $(document).on('click.portalslist', '#portalslist .filterEnl', function() { + $('#portalslist').html(window.plugin.portalslist.portalTable($(this).data('sort'),window.plugin.portalslist.sortOrder,2)); + }); +} + +// PLUGIN END ////////////////////////////////////////////////////////// + +@@PLUGINEND@@