From 43fa4fba26e06e49f1344eb8bc952c474c5982d0 Mon Sep 17 00:00:00 2001 From: Floens Date: Wed, 27 May 2015 17:00:34 +0200 Subject: [PATCH] Add save icon to the image viewer --- .../ui/controller/ImageViewerController.java | 29 ++++++++++-------- .../ic_file_download_white_24dp.png | Bin 0 -> 163 bytes .../ic_file_download_white_24dp.png | Bin 0 -> 116 bytes .../ic_file_download_white_24dp.png | Bin 0 -> 157 bytes .../ic_file_download_white_24dp.png | Bin 0 -> 197 bytes .../ic_file_download_white_24dp.png | Bin 0 -> 233 bytes Clover/app/src/main/res/values/strings.xml | 1 - 7 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java index 7db8ec25..b15ea100 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java @@ -112,10 +112,10 @@ public class ImageViewerController extends Controller implements View.OnClickLis public void onCreate() { super.onCreate(); - navigationItem.menu = new ToolbarMenu(context); navigationItem.subtitle = "0"; + navigationItem.menu = new ToolbarMenu(context); + navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SAVE_ID, R.drawable.ic_file_download_white_24dp)); overflowMenuItem = navigationItem.createOverflow(context, this, Arrays.asList( - new FloatingMenuItem(SAVE_ID, string(R.string.image_save)), new FloatingMenuItem(OPEN_BROWSER_ID, string(R.string.action_open_browser)), new FloatingMenuItem(SHARE_ID, string(R.string.action_share)), new FloatingMenuItem(SEARCH_ID, string(R.string.action_search_image)), @@ -140,23 +140,17 @@ public class ImageViewerController extends Controller implements View.OnClickLis @Override public void onMenuItemClicked(ToolbarMenuItem item) { + if ((Integer) item.getId() == SAVE_ID) { + saveShare(false, presenter.getCurrentPostImage()); + } } @Override public void onSubMenuItemClicked(ToolbarMenuItem parent, FloatingMenuItem item) { PostImage postImage = presenter.getCurrentPostImage(); switch ((Integer) item.getId()) { - case SAVE_ID: case SHARE_ID: - boolean share = ((Integer) item.getId()) == SHARE_ID; - if (share && ChanSettings.shareUrl.get()) { - AndroidUtils.shareLink(postImage.imageUrl); - } else { - ImageSaver.getInstance().saveImage(context, postImage.imageUrl, - ChanSettings.saveOriginalFilename.get() ? postImage.originalName : postImage.filename, - postImage.extension, - share); - } + saveShare(true, postImage); break; case OPEN_BROWSER_ID: AndroidUtils.openLink(postImage.imageUrl); @@ -204,6 +198,17 @@ public class ImageViewerController extends Controller implements View.OnClickLis } } + private void saveShare(boolean share, PostImage postImage) { + if (share && ChanSettings.shareUrl.get()) { + AndroidUtils.shareLink(postImage.imageUrl); + } else { + ImageSaver.getInstance().saveImage(context, postImage.imageUrl, + ChanSettings.saveOriginalFilename.get() ? postImage.originalName : postImage.filename, + postImage.extension, + share); + } + } + @Override public void onClick(View v) { presenter.onExit(); diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a2039c583803eab552eb2ad15248ad4f306b14 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjh{y4_Q*ZMgP~c#YJsK$U z)~(q1m-m)lF^^vy&zFBx;@>#sNTW$[{bH;=%sZG7QZ>uQBcw?@Ce|ClF7G156^ z#Rt_}Q9HRs{l8sYa>)1&$3+cMLFMTJXY2PZ*sH$V@BeR?lj;@>g(qYZ*L3k@0BvRP MboFyt=akR{0D4_J0ssI2 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d400472fd64b0a90998ce6c5eab813b7c8eeec12 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u; OhQZU-&t;ucLK6V({vp)> literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f53cc0c62c228828d73c90f681eda0835179b0b0 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6i*k&kch)?FYe|&V8Fv1*n95m zR5e$DAHp{l&A!8XfIV8!#r>2YP$7e#!c^^(-Y0%@RoZ*qi`F<)`EKq{{v+@Hw5*sR zFA(}!c2Utj$B^^;IgbBnE;xI?rFh=CsojiM7+vgNGclA;TJ|n(&Igb&p00i_>zopr E0CTxJ1ONa4 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..78aa591668242095017c9d5e96f7a9873fe1fbc8 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOTemLo)8Yz3#}@pdi5FIM2@h zcsF};z`+CWBzDIKG_pEry11Auz9p#O(7?dR#KIx4z`kMCt2a+vCtcS%nf>^QsrM(T z{K~l&Yj@SA9If=c^vXIaY>wlkMR7)vg;t&u=kNuYJa3$GaHnEwp`ORgIc%D@VZ8#xa<@HhnOS1viNAnEC})a|0sJS72xJ-2)f?&QaR z?3aFfZT$|bN3Ya!ZWwgOIdJDMXyKo5=w(d|$6F^2ai?7ZNyM@uS}y1~X^1JRa37T8 i%D!pbm~%M(0r%^vOJ5j@by@-4#Ng@b=d#Wzp$Pz$!&MXj literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 3445e491..211b883c 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -62,7 +62,6 @@ along with this program. If not, see . Open this thread? No applications found to open link - Save image Saved image to Saving image failed Cannot make save directory