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/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_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_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_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/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/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_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_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_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/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/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_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_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_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/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_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_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_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/menu/main.xml b/mobile/res/menu/main.xml index 921217aa..2b77b4d6 100644 --- a/mobile/res/menu/main.xml +++ b/mobile/res/menu/main.xml @@ -7,7 +7,7 @@ android:actionViewClass="android.widget.SearchView" /> @@ -21,7 +21,7 @@ diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java index 8db99742..ab423fdb 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java @@ -63,22 +63,22 @@ 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.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; diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java index 3b330757..24523eeb 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java @@ -81,7 +81,7 @@ 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.ic_action_web_site); @@ -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