From b395725fccb323a3a129d253089d80932eac314e Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 19 Mar 2012 19:59:00 -0700 Subject: [PATCH] Show picture popups in task activity feed --- .../astrid/notes/EditNoteActivity.java | 9 +- .../astrid/activity/TaskEditFragment.java | 26 +++--- .../todoroo/astrid/adapter/UpdateAdapter.java | 83 ++++++++++--------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java index 3d453e0ec..c99c3072d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -303,7 +303,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene this.addView(notesView); } - if ( items.size() > commentItems) { + if (items.size() > commentItems) { Button loadMore = new Button(getContext()); loadMore.setText(R.string.TEA_load_more); loadMore.setBackgroundColor(Color.alpha(0)); @@ -368,12 +368,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene // picture final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture); { - if(TextUtils.isEmpty(item.commentPicture) || item.commentPicture.equals("null")) //$NON-NLS-1$ - commentPictureView.setVisibility(View.GONE); - else { - commentPictureView.setVisibility(View.VISIBLE); - commentPictureView.setUrl(item.commentPicture); - } + UpdateAdapter.setupImagePopupForCommentView(view, commentPictureView, item.commentPicture, item.title.toString(), fragment, imageCache); } } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index e91adacaa..1d42f01ce 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -405,23 +405,23 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } - mAdapter = new TaskEditViewPager(getActivity(), tabStyle); - mAdapter.parent = this; + mAdapter = new TaskEditViewPager(getActivity(), tabStyle); + mAdapter.parent = this; - mPager = (NestableViewPager) getView().findViewById(R.id.pager); - mPager.setAdapter(mAdapter); + mPager = (NestableViewPager) getView().findViewById(R.id.pager); + mPager.setAdapter(mAdapter); - mIndicator = (TabPageIndicator) getView().findViewById( - R.id.indicator); - mIndicator.setViewPager(mPager); - mIndicator.setOnPageChangeListener(this); + mIndicator = (TabPageIndicator) getView().findViewById( + R.id.indicator); + mIndicator.setViewPager(mPager); + mIndicator.setOnPageChangeListener(this); - if (moreControls.getParent() != null && moreControls.getParent() != mPager) { - ((ViewGroup) moreControls.getParent()).removeView(moreControls); - } + if (moreControls.getParent() != null && moreControls.getParent() != mPager) { + ((ViewGroup) moreControls.getParent()).removeView(moreControls); + } - commentsBar.setVisibility(View.VISIBLE); - moreTab.setVisibility(View.VISIBLE); + commentsBar.setVisibility(View.VISIBLE); + moreTab.setVisibility(View.VISIBLE); } private void setCurrentTab(int position) { diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index 79d551ccb..fa36a2ac9 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -143,45 +143,8 @@ public class UpdateAdapter extends CursorAdapter { final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture); { final String updatePicture = update.getValue(Update.PICTURE); - if (!TextUtils.isEmpty(updatePicture) && !"null".equals(updatePicture)) { - commentPictureView.setVisibility(View.VISIBLE); - commentPictureView.setUrl(updatePicture); - - if(imageCache.contains(updatePicture)) { - try { - commentPictureView.setDefaultImageBitmap(imageCache.get(updatePicture)); - } catch (IOException e) { - e.printStackTrace(); - } - } - else { - commentPictureView.setUrl(updatePicture); - } - - final String message = update.getValue(Update.MESSAGE); - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - AlertDialog image = new AlertDialog.Builder(fragment.getActivity()).create(); - AsyncImageView imageView = new AsyncImageView(fragment.getActivity()); - imageView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT)); - imageView.setDefaultImageResource(android.R.drawable.ic_menu_gallery); - imageView.setUrl(updatePicture); - image.setView(imageView); - - image.setMessage(message); - image.setButton(fragment.getString(R.string.DLG_close), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - return; - } - }); - image.show(); - } - }); - } else { - commentPictureView.setVisibility(View.GONE); - } + setupImagePopupForCommentView(view, commentPictureView, updatePicture, + update.getValue(Update.MESSAGE), fragment, imageCache); } // name @@ -200,6 +163,48 @@ public class UpdateAdapter extends CursorAdapter { } + public static void setupImagePopupForCommentView(View view, AsyncImageView commentPictureView, final String updatePicture, + final String message, final Fragment fragment, ImageDiskCache imageCache) { + if (!TextUtils.isEmpty(updatePicture) && !"null".equals(updatePicture)) { //$NON-NLS-1$ + commentPictureView.setVisibility(View.VISIBLE); + commentPictureView.setUrl(updatePicture); + + if(imageCache.contains(updatePicture)) { + try { + commentPictureView.setDefaultImageBitmap(imageCache.get(updatePicture)); + } catch (IOException e) { + e.printStackTrace(); + } + } + else { + commentPictureView.setUrl(updatePicture); + } + + view.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + AlertDialog image = new AlertDialog.Builder(fragment.getActivity()).create(); + AsyncImageView imageView = new AsyncImageView(fragment.getActivity()); + imageView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT)); + imageView.setDefaultImageResource(android.R.drawable.ic_menu_gallery); + imageView.setUrl(updatePicture); + image.setView(imageView); + + image.setMessage(message); + image.setButton(fragment.getString(R.string.DLG_close), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + return; + } + }); + image.show(); + } + }); + } else { + commentPictureView.setVisibility(View.GONE); + } + } + public static String linkify (String string, String linkColor) { return String.format("%s", linkColor, string); //$NON-NLS-1$ }