Brion VIBBER has submitted this change and it was merged. Change subject: Add My Contributions & Logout to left nav menu ......................................................................
Add My Contributions & Logout to left nav menu Change-Id: I1a33caa64bd8689af93a07cb502c1a48a70a078f --- A icon-svgs/24/puzzle_white.svg A wikipedia/res/drawable-hdpi/puzzle_white.png A wikipedia/res/drawable-ldpi/puzzle_white.png A wikipedia/res/drawable-mdpi/puzzle_white.png A wikipedia/res/drawable-xhdpi/puzzle_white.png A wikipedia/res/drawable-xxhdpi/puzzle_white.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 10 files changed, 78 insertions(+), 10 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/icon-svgs/24/puzzle_white.svg b/icon-svgs/24/puzzle_white.svg new file mode 100644 index 0000000..3461bca --- /dev/null +++ b/icon-svgs/24/puzzle_white.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + viewBox="0 0 96 96" enable-background="new 0 0 96 96" xml:space="preserve"> +<path fill="#FFFFFF" d="M76.8,34.3V12.8H55.4C54.9,5.7,48.9,0,41.6,0c-7.3,0-13.3,5.7-13.8,12.8H6.4v21.4c0.3,0,1.7,0,2.1,0 + c7.6,0,12.9,5.2,12.9,12.8S16.1,61.9,8.5,61.9c-0.3,0-1.8,0-2.1,0v21.4h21.5C28.4,90.4,34.4,96,41.6,96c7.3,0,13.2-5.6,13.8-12.7 + h21.4V61.8C84,61.3,89.6,55.3,89.6,48S84,34.8,76.8,34.3z"/> +</svg> diff --git a/wikipedia/res/drawable-hdpi/puzzle_white.png b/wikipedia/res/drawable-hdpi/puzzle_white.png new file mode 100644 index 0000000..c5917ad --- /dev/null +++ b/wikipedia/res/drawable-hdpi/puzzle_white.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/puzzle_white.png b/wikipedia/res/drawable-ldpi/puzzle_white.png new file mode 100644 index 0000000..a8a9497 --- /dev/null +++ b/wikipedia/res/drawable-ldpi/puzzle_white.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/puzzle_white.png b/wikipedia/res/drawable-mdpi/puzzle_white.png new file mode 100644 index 0000000..3d2601e --- /dev/null +++ b/wikipedia/res/drawable-mdpi/puzzle_white.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/puzzle_white.png b/wikipedia/res/drawable-xhdpi/puzzle_white.png new file mode 100644 index 0000000..beb50c2 --- /dev/null +++ b/wikipedia/res/drawable-xhdpi/puzzle_white.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/puzzle_white.png b/wikipedia/res/drawable-xxhdpi/puzzle_white.png new file mode 100644 index 0000000..f2dbf64 --- /dev/null +++ b/wikipedia/res/drawable-xxhdpi/puzzle_white.png Binary files differ diff --git a/wikipedia/res/layout/fragment_navdrawer.xml b/wikipedia/res/layout/fragment_navdrawer.xml index 99b4ab1..ab35118 100644 --- a/wikipedia/res/layout/fragment_navdrawer.xml +++ b/wikipedia/res/layout/fragment_navdrawer.xml @@ -49,7 +49,6 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_username" - android:background="?android:attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingRight="8dp" @@ -84,6 +83,26 @@ </LinearLayout> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:background="#038368" /> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:id="@+id/nav_item_my_contributions" + android:background="?android:attr/selectableItemBackground" + > + <ImageView android:layout_width="24dp" android:layout_height="24dp" + android:layout_margin="12dp" + android:layout_gravity="center_vertical" + android:src="@drawable/puzzle_white" + /> + <org.wikipedia.styledviews.StyledTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/nav_item_my_contributions" + style="?android:textAppearanceMediumInverse" + /> + </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -208,6 +227,25 @@ style="?android:textAppearanceMediumInverse" /> </LinearLayout> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:id="@+id/nav_item_logout" + android:background="?android:attr/selectableItemBackground" + > + <ImageView android:layout_width="24dp" android:layout_height="24dp" + android:layout_margin="12dp" + android:layout_gravity="center_vertical" + android:background="#fff" + /> + <org.wikipedia.styledviews.StyledTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/nav_item_logout" + style="?android:textAppearanceMediumInverse" + /> + </LinearLayout> </LinearLayout> </ScrollView> diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 73aef6e..8ebed21 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -66,4 +66,5 @@ <string name="create_account_account_created_toast">Message shown in a small toast when account creation is successful.</string> <string name="user_contribs_more_action">Text shown as a button at the end of lists that let the user load more items.</string> <string name="activity_my_contributions_title">Title for screen showing list of edits by current user.</string> + <string name="nav_item_my_contributions">Text for item in nav menu that when tapped shows list of edits made by the user.</string> </resources> diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index d8ba0db..7294d05 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -122,4 +122,5 @@ <string name="create_account_account_created_toast">Account created!</string> <string name="user_contribs_more_action">Load more</string> <string name="activity_my_contributions_title">My Contributions</string> + <string name="nav_item_my_contributions">My contributions</string> </resources> diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java index 1abd875..208f3c6 100644 --- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java @@ -15,19 +15,27 @@ import org.wikipedia.settings.*; public class NavDrawerFragment extends Fragment implements View.OnClickListener { - private static final int[] ACTION_ITEMS_TEXT = { + private static final int[] ACTION_ITEMS_ALL = { R.id.nav_item_history, R.id.nav_item_saved_pages, R.id.nav_item_settings, R.id.nav_item_login, - R.id.nav_item_username, + R.id.nav_item_my_contributions, R.id.nav_item_random, - R.id.nav_item_send_feedback + R.id.nav_item_send_feedback, + R.id.nav_item_logout // We don't actually need R.id.nav_item_zero here because we add it programmatically // below, and we don't need an on-tap as of now }; - private View[] actionViews = new View[ACTION_ITEMS_TEXT.length]; + private static final int[] ACTION_ITEMS_LOGGED_IN_ONLY = { + R.id.nav_item_my_contributions, + R.id.nav_item_username, + R.id.nav_item_logout + }; + + private View[] actionViews = new View[ACTION_ITEMS_ALL.length]; + private View[] loggedInOnyActionViews = new View[ACTION_ITEMS_LOGGED_IN_ONLY.length]; private WikipediaApp app; private RandomHandler randomHandler; @@ -52,9 +60,13 @@ ((TextView)getView().findViewById(R.id.nav_drawer_version)).setText(WikipediaApp.APP_VERSION_STRING); - for (int i = 0; i < ACTION_ITEMS_TEXT.length; i++) { - actionViews[i] = getView().findViewById(ACTION_ITEMS_TEXT[i]); + for (int i = 0; i < ACTION_ITEMS_ALL.length; i++) { + actionViews[i] = getView().findViewById(ACTION_ITEMS_ALL[i]); actionViews[i].setOnClickListener(this); + } + + for (int i = 0; i < ACTION_ITEMS_LOGGED_IN_ONLY.length; i++) { + loggedInOnyActionViews[i] = getView().findViewById(ACTION_ITEMS_LOGGED_IN_ONLY[i]); } wikipediaZeroText = (TextView) getView().findViewById(R.id.nav_item_zero); @@ -74,11 +86,15 @@ // Do login / logout swap if (app.getUserInfoStorage().isLoggedIn()) { loginContainer.setVisibility(View.GONE); - usernameContainer.setVisibility(View.VISIBLE); + for (int i = 0; i < loggedInOnyActionViews.length; i++) { + loggedInOnyActionViews[i].setVisibility(View.VISIBLE); + } usernamePrimaryText.setText(app.getUserInfoStorage().getUser().getUsername()); } else { - usernameContainer.setVisibility(View.GONE); loginContainer.setVisibility(View.VISIBLE); + for (int i = 0; i < loggedInOnyActionViews.length; i++) { + loggedInOnyActionViews[i].setVisibility(View.GONE); + } } // Show Wikipedia Zero if ON, otherwise hide it @@ -132,7 +148,7 @@ case R.id.nav_item_random: randomHandler.doVistRandomArticle(); break; - case R.id.nav_item_username: + case R.id.nav_item_my_contributions: intent.setClass(this.getActivity(), UserContribsActivity.class); startActivity(intent); break; @@ -143,6 +159,9 @@ intent.setData(Uri.parse("mailto:yuvipa...@wikimedia.org?subject=Android App " + WikipediaApp.APP_VERSION_STRING + " Feedback")); startActivity(intent); break; + case R.id.nav_item_logout: + doLogout(); + break; default: throw new RuntimeException("Unknown ID clicked!"); } -- To view, visit https://gerrit.wikimedia.org/r/119910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a33caa64bd8689af93a07cb502c1a48a70a078f Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
