From 5a2a6cbac5b16f78ea093ef8fc5441946cced4a2 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Sun, 10 Aug 2014 23:11:52 +0200 Subject: [PATCH] Added file deleted image. --- .../java/org/floens/chan/core/model/Post.java | 1 + .../floens/chan/core/net/ChanReaderRequest.java | 3 +++ .../java/org/floens/chan/ui/view/PostView.java | 15 +++++++++++++-- .../src/main/res/drawable-nodpi/file_deleted.png | Bin 0 -> 1257 bytes 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-nodpi/file_deleted.png diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java index 472d4507..e03bcdab 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java @@ -62,6 +62,7 @@ public class Post { public int fileSize; public int images = -1; public String rawComment; + public boolean fileDeleted = false; public boolean deleted = false; diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java index 3e5e6a3c..8dca5a16 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java @@ -368,6 +368,9 @@ public class ChanReaderRequest extends JsonReaderRequest> { case "images": post.images = reader.nextInt(); break; + case "filedeleted": + post.fileDeleted = reader.nextInt() == 1; + break; default: // Unknown/ignored key // log("Unknown/ignored key: " + key + "."); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java index 83eddf10..a81b8eaf 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java @@ -139,11 +139,20 @@ public class PostView extends LinearLayout implements View.OnClickListener { ta.recycle(); - if (post.hasImage) { + if (post.fileDeleted) { imageView.setVisibility(View.VISIBLE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(R.drawable.file_deleted); + imageView.setImageUrl(null, null); + } else if (post.hasImage) { + imageView.setVisibility(View.VISIBLE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(0); imageView.setImageUrl(post.thumbnailUrl, ChanApplication.getVolleyImageLoader()); } else { imageView.setVisibility(View.GONE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(0); imageView.setImageUrl(null, null); } @@ -381,7 +390,9 @@ public class PostView extends LinearLayout implements View.OnClickListener { imageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - manager.onThumbnailClicked(post); + if (post.hasImage && !post.fileDeleted) { + manager.onThumbnailClicked(post); + } } }); diff --git a/Clover/app/src/main/res/drawable-nodpi/file_deleted.png b/Clover/app/src/main/res/drawable-nodpi/file_deleted.png new file mode 100644 index 0000000000000000000000000000000000000000..aaf2a808715fa3693517e31b2b260a9b3d9b25fd GIT binary patch literal 1257 zcmeAS@N?(olHy`uVBq!ia0vp^Ye1NT4M;vSbiVk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcX91fH32|H2DgkphSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>b4n+flc>n*y7GVyyG`6P32f`KKIaH6%xw`w8kHYu% z|IMO4;n&Zwyng7-v~h#e2tkoz-yS}EIREm}pIWKkb1s!Hd*ij+)^pc(FVFPJ`;3<^ zxjAK0+UhALuWxSMQ@Q8K=g-B~&-=g4pBYqkUadC$)VeLVCoid9J*C9#rFF2^EMLvc zZC;+6=f$3$ecap5&Td=rzl{GgHHk3z@87@H+uPq?DYmk%|8nVk%iI#Potunj-kbUC zWzMH)>yz)Q%ifn>K4+qT`sKzS-@bjDd;75erOy*Tx0lr~@V0)LQf4+5UwZzW|Ev5An7cF8&;AB_?HtGxw&Cx5HD9io z{VdheR;*gF{|;Y$(Y(3#SLzeIZraZNGFNl=vbiSj(}TUNK%DO}JI$9a*_=0P`qM8F zHI#sw&VSjLO}V?-^Zv|D*|$7D*O>to0XaqIr&a@XzFt-t>DPbs`Sa)R z@5t3nn%6(ae#>v>*jvC**0!Gfa&G3lb87pyPJXj5{d=7GTc6LH=E!yX`}^PDXKmfYAc+W#+Zb*_EFwPCkD8 zxa^$#-Y>?9%jbh44IYsu(ZDFzg7`7={JN)Szg*J1`|8iUEtk(Pn_?238h-1o=cT=& zK;wfhmdKI;Vst E0DBObnE(I) literal 0 HcmV?d00001