clear pending slides when attachment reselected

Fixes #2012

// FREEBIE
pull/1/head
Jake McGinty 11 years ago
parent db6f8618e6
commit 4cab657ebe

@ -61,29 +61,29 @@ public class AttachmentManager {
} }
public void setImage(Uri image) throws IOException, BitmapDecodingException { public void setImage(Uri image) throws IOException, BitmapDecodingException {
ImageSlide slide = new ImageSlide(context, image); setMedia(new ImageSlide(context, image), 345, 261);
slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(345, 261));
attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged();
} }
public void setVideo(Uri video) throws IOException, MediaTooLargeException { public void setVideo(Uri video) throws IOException, MediaTooLargeException {
VideoSlide slide = new VideoSlide(context, video); setMedia(new VideoSlide(context, video));
slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(thumbnail.getWidth(), thumbnail.getHeight()));
attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged();
} }
public void setAudio(Uri audio)throws IOException, MediaTooLargeException { public void setAudio(Uri audio) throws IOException, MediaTooLargeException {
AudioSlide slide = new AudioSlide(context, audio); setMedia(new AudioSlide(context, audio));
}
public void setMedia(Slide slide, int thumbnailWidth, int thumbnailHeight) {
slideDeck.clear();
slideDeck.addSlide(slide); slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(thumbnail.getWidth(), thumbnail.getHeight())); thumbnail.setImageDrawable(slide.getThumbnail(thumbnailWidth, thumbnailHeight));
attachmentView.setVisibility(View.VISIBLE); attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged(); attachmentListener.onAttachmentChanged();
} }
public void setMedia(Slide slide) {
setMedia(slide, thumbnail.getWidth(), thumbnail.getHeight());
}
public boolean isAttachmentPresent() { public boolean isAttachmentPresent() {
return attachmentView.getVisibility() == View.VISIBLE; return attachmentView.getVisibility() == View.VISIBLE;
} }

Loading…
Cancel
Save