jenkins-bot has submitted this change and it was merged. Change subject: Add a "Today" button to the menu which leads to the main page. ......................................................................
Add a "Today" button to the menu which leads to the main page. For consistency with the iOS app. Change-Id: I35ae5c692f6603cb77fd17df7561e0c4496ab850 --- A icon-svgs/24/ic_today.svg A wikipedia/res/drawable-hdpi/ic_today.png A wikipedia/res/drawable-ldpi/ic_today.png A wikipedia/res/drawable-ldrtl-hdpi/ic_today.png A wikipedia/res/drawable-ldrtl-ldpi/ic_today.png A wikipedia/res/drawable-ldrtl-mdpi/ic_today.png A wikipedia/res/drawable-ldrtl-xhdpi/ic_today.png A wikipedia/res/drawable-ldrtl-xxhdpi/ic_today.png A wikipedia/res/drawable-mdpi/ic_today.png A wikipedia/res/drawable-xhdpi/ic_today.png A wikipedia/res/drawable-xxhdpi/ic_today.png M wikipedia/res/layout/fragment_navdrawer.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java 15 files changed, 165 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/icon-svgs/24/ic_today.svg b/icon-svgs/24/ic_today.svg new file mode 100644 index 0000000..3c228b1 --- /dev/null +++ b/icon-svgs/24/ic_today.svg @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<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"; + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="24px" + height="24px" + viewBox="0 0 24 24" + enable-background="new 0 0 24 24" + xml:space="preserve" + inkscape:version="0.48.1 " + sodipodi:docname="ic_today.svg"><metadata + id="metadata52"><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="defs50" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1196" + inkscape:window-height="881" + id="namedview48" + showgrid="false" + inkscape:zoom="12.125" + inkscape:cx="12" + inkscape:cy="17.517919" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="sun" /> +<g + id="sun"> + <g + id="g4" + style="fill:#ffffff"> + <path + d="M11.999,17.391c-2.939,0-5.39-2.452-5.39-5.391c0-2.972,2.418-5.391,5.391-5.391S17.391,9.027,17.391,12 s-2.418,5.391-5.39,5.391" + id="path6" + style="fill:#ffffff" /> + </g> + <g + id="g8" + style="fill:#ffffff"> + <g + id="g10" + style="fill:#ffffff"> + <path + d="M11.214,0.313h0.016c0.86,0,1.557,0.697,1.557,1.557v2.646h-1.572V0.313H11.214z" + id="path12" + style="fill:#ffffff" /> + </g> + <g + id="g14" + style="fill:#ffffff"> + <path + d="M11.214,19.485h1.572v4.202H12.77c-0.86,0-1.557-0.697-1.557-1.557L11.214,19.485L11.214,19.485z" + id="path16" + style="fill:#ffffff" /> + </g> + </g> + <g + id="g18" + style="fill:#ffffff"> + <g + id="g20" + style="fill:#ffffff"> + <path + d="M19.694,3.18l0.011,0.011c0.608,0.608,0.608,1.593,0,2.201l-1.871,1.871l-1.112-1.112L19.694,3.18z" + id="path22" + style="fill:#ffffff" /> + </g> + <g + id="g24" + style="fill:#ffffff"> + <path + d="M6.137,16.737l1.112,1.112L4.278,20.82l-0.011-0.011c-0.608-0.608-0.608-1.593,0-2.201L6.137,16.737z" + id="path26" + style="fill:#ffffff" /> + </g> + </g> + <g + id="g28" + style="fill:#ffffff"> + <g + id="g30" + style="fill:#ffffff"> + <path + d="M3.161,4.264l0.011-0.011c0.608-0.608,1.593-0.608,2.201,0l1.871,1.871L6.133,7.235L3.161,4.264z" + id="path32" + style="fill:#ffffff" /> + </g> + <g + id="g34" + style="fill:#ffffff"> + <path + d="M16.718,17.821l1.112-1.112l2.971,2.971l-0.011,0.011c-0.608,0.608-1.593,0.608-2.201,0L16.718,17.821z" + id="path36" + style="fill:#ffffff" /> + </g> + </g> + <g + id="g38" + style="fill:#ffffff"> + <g + id="g40" + style="fill:#ffffff"> + <path + d="M1.869,11.214h2.645v1.572H0.313V12.77C0.313,11.911,1.01,11.214,1.869,11.214z" + id="path42" + style="fill:#ffffff" /> + </g> + <g + id="g44" + style="fill:#ffffff"> + <path + d="M19.485,11.214h4.202v0.016c0,0.86-0.697,1.557-1.557,1.557h-2.645V11.214z" + id="path46" + style="fill:#ffffff" /> + </g> + </g> +</g> +</svg> \ No newline at end of file diff --git a/wikipedia/res/drawable-hdpi/ic_today.png b/wikipedia/res/drawable-hdpi/ic_today.png new file mode 100644 index 0000000..34f3f73 --- /dev/null +++ b/wikipedia/res/drawable-hdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_today.png b/wikipedia/res/drawable-ldpi/ic_today.png new file mode 100644 index 0000000..5399c92 --- /dev/null +++ b/wikipedia/res/drawable-ldpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_today.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_today.png new file mode 100644 index 0000000..c60d9d4 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_today.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_today.png new file mode 100644 index 0000000..f4b323c --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_today.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_today.png new file mode 100644 index 0000000..3810f80 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_today.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_today.png new file mode 100644 index 0000000..3e1ac8d --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_today.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_today.png new file mode 100644 index 0000000..023db86 --- /dev/null +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_today.png b/wikipedia/res/drawable-mdpi/ic_today.png new file mode 100644 index 0000000..aebbaad --- /dev/null +++ b/wikipedia/res/drawable-mdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_today.png b/wikipedia/res/drawable-xhdpi/ic_today.png new file mode 100644 index 0000000..3e1ac8d --- /dev/null +++ b/wikipedia/res/drawable-xhdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_today.png b/wikipedia/res/drawable-xxhdpi/ic_today.png new file mode 100644 index 0000000..c8dd937 --- /dev/null +++ b/wikipedia/res/drawable-xxhdpi/ic_today.png Binary files differ diff --git a/wikipedia/res/layout/fragment_navdrawer.xml b/wikipedia/res/layout/fragment_navdrawer.xml index 0f79753..17cc934 100644 --- a/wikipedia/res/layout/fragment_navdrawer.xml +++ b/wikipedia/res/layout/fragment_navdrawer.xml @@ -86,6 +86,28 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:id="@+id/nav_item_today" + android:background="@drawable/nav_item_background" + > + <ImageView android:layout_width="24dp" android:layout_height="24dp" + android:layout_margin="12dp" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_today" + android:contentDescription="@null" + /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/nav_item_today" + android:textColor="@color/nav_text" + style="?android:textAppearanceMedium" + /> + </LinearLayout> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" android:id="@+id/nav_item_history" android:background="@drawable/nav_item_background" > diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 2fbfe73..b0f38b7 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -25,6 +25,7 @@ <string name="menu_clear_all_bookmarks">Menu item text for clearing bookmarks</string> <string name="menu_clear_all_saved_pages">Clear is an imperative verb. This is an action that clears all saved pages.</string> <string name="page_does_not_exist_error">Text shown when the requested page does not exist</string> + <string name="nav_item_today">Text in navigation sidebar that when tapped leads to the Main Page.</string> <string name="dialog_title_clear_history">Title for dialog box asking if you want to clear your reading history.</string> <string name="saved_pages_activity_title">Title for screen that shows list of saved pages. {{Identical|Saved page}}</string> diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index bb68a1e..4e9f027 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -20,6 +20,7 @@ <string name="menu_clear_all_bookmarks">Clear bookmarks</string> <string name="menu_clear_all_saved_pages">Clear saved pages</string> <string name="page_does_not_exist_error">This page does not exist.</string> + <string name="nav_item_today">Today</string> <string name="dialog_title_clear_history">Clear browsing history?</string> <string name="saved_pages_activity_title">Saved pages</string> diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java index 5b91d32..77aa3c7 100644 --- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java @@ -23,6 +23,7 @@ public class NavDrawerFragment extends Fragment implements View.OnClickListener { private static final int[] ACTION_ITEMS_ALL = { + R.id.nav_item_today, R.id.nav_item_history, R.id.nav_item_saved_pages, R.id.nav_item_more, @@ -129,6 +130,9 @@ public void onClick(View view) { Intent intent = new Intent(); switch (view.getId()) { + case R.id.nav_item_today: + app.getBus().post(new RequestMainPageEvent()); + break; case R.id.nav_item_history: intent.setClass(this.getActivity(), HistoryActivity.class); getActivity().startActivityForResult(intent, PageActivity.ACTIVITY_REQUEST_HISTORY); -- To view, visit https://gerrit.wikimedia.org/r/149586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35ae5c692f6603cb77fd17df7561e0c4496ab850 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana <dga...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
