diff --git a/mobile/res/drawable-hdpi/ic_dialog_browser.png b/mobile/res/drawable-hdpi/browser.png similarity index 100% rename from mobile/res/drawable-hdpi/ic_dialog_browser.png rename to mobile/res/drawable-hdpi/browser.png diff --git a/mobile/res/drawable-hdpi/copy.png b/mobile/res/drawable-hdpi/copy.png new file mode 100644 index 00000000..623b7150 Binary files /dev/null and b/mobile/res/drawable-hdpi/copy.png differ diff --git a/mobile/res/drawable-hdpi/ic_dialog_copy.png b/mobile/res/drawable-hdpi/ic_dialog_copy.png deleted file mode 100644 index 72c6bc6e..00000000 Binary files a/mobile/res/drawable-hdpi/ic_dialog_copy.png and /dev/null differ diff --git a/mobile/res/drawable-hdpi/ic_dialog_share.png b/mobile/res/drawable-hdpi/share.png similarity index 100% rename from mobile/res/drawable-hdpi/ic_dialog_share.png rename to mobile/res/drawable-hdpi/share.png diff --git a/mobile/res/drawable-mdpi/ic_dialog_browser.png b/mobile/res/drawable-mdpi/browser.png similarity index 100% rename from mobile/res/drawable-mdpi/ic_dialog_browser.png rename to mobile/res/drawable-mdpi/browser.png diff --git a/mobile/res/drawable-mdpi/copy.png b/mobile/res/drawable-mdpi/copy.png new file mode 100644 index 00000000..efb2445f Binary files /dev/null and b/mobile/res/drawable-mdpi/copy.png differ diff --git a/mobile/res/drawable-mdpi/ic_dialog_copy.png b/mobile/res/drawable-mdpi/ic_dialog_copy.png deleted file mode 100644 index d93968e5..00000000 Binary files a/mobile/res/drawable-mdpi/ic_dialog_copy.png and /dev/null differ diff --git a/mobile/res/drawable-mdpi/ic_dialog_share.png b/mobile/res/drawable-mdpi/share.png similarity index 100% rename from mobile/res/drawable-mdpi/ic_dialog_share.png rename to mobile/res/drawable-mdpi/share.png diff --git a/mobile/res/drawable-xhdpi/ic_dialog_browser.png b/mobile/res/drawable-xhdpi/browser.png similarity index 100% rename from mobile/res/drawable-xhdpi/ic_dialog_browser.png rename to mobile/res/drawable-xhdpi/browser.png diff --git a/mobile/res/drawable-xhdpi/copy.png b/mobile/res/drawable-xhdpi/copy.png new file mode 100644 index 00000000..00bff33c Binary files /dev/null and b/mobile/res/drawable-xhdpi/copy.png differ diff --git a/mobile/res/drawable-xhdpi/ic_dialog_copy.png b/mobile/res/drawable-xhdpi/ic_dialog_copy.png deleted file mode 100644 index 04e290d8..00000000 Binary files a/mobile/res/drawable-xhdpi/ic_dialog_copy.png and /dev/null differ diff --git a/mobile/res/drawable-xhdpi/ic_dialog_share.png b/mobile/res/drawable-xhdpi/share.png similarity index 100% rename from mobile/res/drawable-xhdpi/ic_dialog_share.png rename to mobile/res/drawable-xhdpi/share.png diff --git a/mobile/src/com/cradle/iitc_mobile/share/IntentFragment.java b/mobile/src/com/cradle/iitc_mobile/share/IntentFragment.java index d80e7c35..bbeca174 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/IntentFragment.java +++ b/mobile/src/com/cradle/iitc_mobile/share/IntentFragment.java @@ -16,6 +16,10 @@ public class IntentFragment extends Fragment implements OnScrollListener, OnItem private IntentListView mListView; private int mScrollIndex, mScrollTop; + public int getIcon() { + return getArguments().getInt("icon"); + } + public String getTitle() { return getArguments().getString("title"); } diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java index 58ac99f1..0506788a 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java @@ -20,12 +20,13 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList IntentFragmentAdapter mFragmentAdapter; ViewPager mViewPager; - private void addTab(Intent intent, String label) + private void addTab(Intent intent, String label, int icon) { IntentFragment fragment = new IntentFragment(); Bundle args = new Bundle(); args.putParcelable("intent", intent); args.putString("title", label); + args.putInt("icon", icon); fragment.setArguments(args); mFragmentAdapter.add(fragment); } @@ -43,14 +44,14 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList intent.setType("text/plain"); intent.putExtra(Intent.EXTRA_TEXT, getUrl()); intent.putExtra(Intent.EXTRA_SUBJECT, mTitle); - addTab(intent, "Share"); + addTab(intent, "Share", R.drawable.share); String geoUri = "geo:" + mLl; intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(geoUri)); - addTab(intent, "Map"); + addTab(intent, "Map", R.drawable.location_map); intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getUrl())); - addTab(intent, "Browser"); + addTab(intent, "Browser", R.drawable.browser); } @Override @@ -91,6 +92,7 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList actionBar.addTab(actionBar .newTab() .setText(fragment.getTitle()) + .setIcon(fragment.getIcon()) .setTabListener(this)); } }