Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/181081
Change subject: Add custom menu item to WebView context mode. ...................................................................... Add custom menu item to WebView context mode. Precursor to sharing images with a quote. Change-Id: I8e5ace83216c390bbab903ac12cb5f67a2fe38fc --- A icon-svgs/24/ic_share.svg A wikipedia/res/drawable-hdpi/ic_share.png A wikipedia/res/drawable-ldpi/ic_share.png A wikipedia/res/drawable-ldrtl-hdpi/ic_share.png A wikipedia/res/drawable-ldrtl-ldpi/ic_share.png A wikipedia/res/drawable-ldrtl-mdpi/ic_share.png A wikipedia/res/drawable-ldrtl-xhdpi/ic_share.png A wikipedia/res/drawable-ldrtl-xxhdpi/ic_share.png A wikipedia/res/drawable-mdpi/ic_share.png A wikipedia/res/drawable-xhdpi/ic_share.png A wikipedia/res/drawable-xxhdpi/ic_share.png M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 12 files changed, 92 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/81/181081/1 diff --git a/icon-svgs/24/ic_share.svg b/icon-svgs/24/ic_share.svg new file mode 100644 index 0000000..9559d17 --- /dev/null +++ b/icon-svgs/24/ic_share.svg @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="24" + height="24" + viewBox="0 0 24 24" + id="svg3059" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="ic_share.svg"> + <metadata + id="metadata3067"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs3065" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="937" + inkscape:window-height="736" + id="namedview3063" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="-3.8644068" + inkscape:cy="12" + inkscape:window-x="284" + inkscape:window-y="164" + inkscape:window-maximized="0" + inkscape:current-layer="svg3059" /> + <path + d="m 18,16.08 c -0.76,0 -1.44,0.3 -1.96,0.77 L 8.91,12.7 C 8.96,12.47 9,12.24 9,12 9,11.76 8.96,11.53 8.91,11.3 L 15.96,7.19 C 16.5,7.69 17.21,8 18,8 19.66,8 21,6.66 21,5 21,3.34 19.66,2 18,2 c -1.66,0 -3,1.34 -3,3 0,0.24 0.04,0.47 0.09,0.7 L 8.04,9.81 C 7.5,9.31 6.79,9 6,9 4.34,9 3,10.34 3,12 c 0,1.66 1.34,3 3,3 0.79,0 1.5,-0.31 2.04,-0.81 l 7.12,4.16 c -0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92 0,-1.61 -1.31,-2.92 -2.92,-2.92 z" + id="path3061" + style="fill:#333333;fill-opacity:0.60000002" + inkscape:connector-curvature="0" /> +</svg> diff --git a/wikipedia/res/drawable-hdpi/ic_share.png b/wikipedia/res/drawable-hdpi/ic_share.png new file mode 100644 index 0000000..8f5755e --- /dev/null +++ b/wikipedia/res/drawable-hdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_share.png b/wikipedia/res/drawable-ldpi/ic_share.png new file mode 100644 index 0000000..47a6bbd --- /dev/null +++ b/wikipedia/res/drawable-ldpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_share.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_share.png new file mode 100644 index 0000000..01607c1 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_share.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_share.png new file mode 100644 index 0000000..89406a7 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_share.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_share.png new file mode 100644 index 0000000..6370ab7 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_share.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_share.png new file mode 100644 index 0000000..fb8302f --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_share.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_share.png new file mode 100644 index 0000000..3e76371 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_share.png b/wikipedia/res/drawable-mdpi/ic_share.png new file mode 100644 index 0000000..aac491b --- /dev/null +++ b/wikipedia/res/drawable-mdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_share.png b/wikipedia/res/drawable-xhdpi/ic_share.png new file mode 100644 index 0000000..6ac7554 --- /dev/null +++ b/wikipedia/res/drawable-xhdpi/ic_share.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_share.png b/wikipedia/res/drawable-xxhdpi/ic_share.png new file mode 100644 index 0000000..34a6c1a --- /dev/null +++ b/wikipedia/res/drawable-xxhdpi/ic_share.png Binary files differ diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java index f575abd..f3d824f 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java @@ -40,13 +40,16 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.widget.Toolbar; +import android.support.v7.view.ActionMode; import android.text.Html; import android.text.TextUtils; import android.util.Log; import android.view.Gravity; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; @@ -74,6 +77,7 @@ private NavDrawerFragment fragmentNavdrawer; private SearchArticlesFragment searchFragment; private TextView searchHintText; + private ActionMode webViewActionMode; public static final int PROGRESS_BAR_MAX_VALUE = 10000; private ProgressBar progressBar; @@ -729,4 +733,37 @@ bus = null; Log.d("Wikipedia", "Deregistering bus"); } + + @Override + public void onSupportActionModeStarted(ActionMode mode) { + if (webViewActionMode == null) { + webViewActionMode = mode; + Menu menu = mode.getMenu(); + MenuItem shareItem = menu.add(R.string.share_via); + shareItem.setIcon(app.getCurrentTheme() == WikipediaApp.THEME_DARK + ? R.drawable.ic_share_dark + : R.drawable.ic_share); + MenuItemCompat.setShowAsAction(shareItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); + shareItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + + // TODO: implement sharing of image with quote! + + if (webViewActionMode != null) { + webViewActionMode.finish(); + } + return true; + } + }); + } + super.onSupportActionModeStarted(mode); + } + + @Override + public void onSupportActionModeFinished(ActionMode mode) { + webViewActionMode = null; + super.onSupportActionModeFinished(mode); + } + } -- To view, visit https://gerrit.wikimedia.org/r/181081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e5ace83216c390bbab903ac12cb5f67a2fe38fc Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
