Yuvipanda has submitted this change and it was merged.
Change subject: Restore Wikipedia Zero status in left side navbar.
......................................................................
Restore Wikipedia Zero status in left side navbar.
Change-Id: I6cecbe6d79623ce10ce701874a4fa8c4c4b94bb0
---
M wikipedia/res/layout/fragment_navdrawer.xml
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
2 files changed, 25 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/wikipedia/res/layout/fragment_navdrawer.xml
b/wikipedia/res/layout/fragment_navdrawer.xml
index 9fbe61f..4f7f889 100644
--- a/wikipedia/res/layout/fragment_navdrawer.xml
+++ b/wikipedia/res/layout/fragment_navdrawer.xml
@@ -144,6 +144,16 @@
/>
</LinearLayout>
+ <org.wikipedia.styledviews.StyledTextView
+ android:id="@+id/nav_item_zero"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_margin="11dp"
+ android:text=""
+ style="?android:textAppearanceSmallInverse"
+ />
+
<!-- Separator view for providing gap between top items and bottom
ones -->
<View android:layout_width="match_parent" android:layout_height="0dp"
android:layout_weight="1" />
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 98057e8..b00b405 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -22,6 +22,8 @@
R.id.nav_item_username,
R.id.nav_item_random,
R.id.nav_item_send_feedback
+ // 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];
@@ -37,10 +39,11 @@
public void onResume() {
super.onResume();
- // Ensure that Login / Logout status is accurate
+ // Ensure that Login / Logout and Wikipedia Zero status is accurate
setupDynamicItems();
}
+ private TextView wikipediaZeroText;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -52,6 +55,8 @@
actionViews[i] = getView().findViewById(ACTION_ITEMS_TEXT[i]);
actionViews[i].setOnClickListener(this);
}
+
+ wikipediaZeroText = (TextView)
getView().findViewById(R.id.nav_item_zero);
randomHandler = new RandomHandler(getActivity());
}
@@ -73,6 +78,14 @@
} else {
usernameContainer.setVisibility(View.GONE);
loginContainer.setVisibility(View.VISIBLE);
+ }
+
+ // Show Wikipedia Zero if ON, otherwise hide it
+ if (WikipediaApp.isWikipediaZeroDevmodeOn() &&
WikipediaApp.getWikipediaZeroDisposition()) {
+ wikipediaZeroText.setText(WikipediaApp.getCarrierMessage());
+ wikipediaZeroText.setVisibility(View.VISIBLE);
+ } else {
+ wikipediaZeroText.setVisibility(View.GONE);
}
}
@@ -133,4 +146,4 @@
}
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/119229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cecbe6d79623ce10ce701874a4fa8c4c4b94bb0
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
