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 00000000..c8a2039c Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ 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 00000000..d400472f Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ 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 00000000..f53cc0c6 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ 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 00000000..78aa5916 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..ded5652e Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ 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