Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382724 )
Change subject: Always show labels on main bottom nav items.
......................................................................
Always show labels on main bottom nav items.
It's a great benefit to the discoverability of our bottom navigation
sections to show the actual text label of the item, in addition to
the icon.
These labels are unconditionally hidden by the BottomNavigationView
component whenever there are more than 3 menu items. This patch pokes
into the view hierarchy and forces the labels to be displayed.
It's a bit of a hack, but worth it for discoverability.
Change-Id: Ic4b1eb54c33a3e6b82694ff6362f390a48309441
---
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
2 files changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/24/382724/1
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index 79abfab..f097727 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -116,6 +116,7 @@
return true;
}
});
+ NavTabLayout.enableAllMenuLabels(tabLayout);
if (savedInstanceState == null) {
handleIntent(getActivity().getIntent());
diff --git a/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
index e24668f..3f8ff3c 100644
--- a/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
+++ b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
@@ -1,9 +1,14 @@
package org.wikipedia.navtab;
import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.internal.BottomNavigationItemView;
+import android.support.design.internal.BottomNavigationMenuView;
import android.support.design.widget.BottomNavigationView;
import android.util.AttributeSet;
import android.view.Menu;
+
+import org.wikipedia.util.log.L;
public class NavTabLayout extends BottomNavigationView {
@@ -22,6 +27,24 @@
setTabViews();
}
+ public static void enableAllMenuLabels(@NonNull NavTabLayout view) {
+ if (view.getChildAt(0) instanceof BottomNavigationMenuView) {
+ BottomNavigationMenuView menuView = (BottomNavigationMenuView)
view.getChildAt(0);
+ for (int i = 0; i < menuView.getChildCount(); i++) {
+ if (!(menuView.getChildAt(i) instanceof
BottomNavigationItemView)) {
+ L.e("NavTabLayout structure not as expected! Please
investigate.");
+ continue;
+ }
+ //noinspection RestrictedApi
+ ((BottomNavigationItemView)
menuView.getChildAt(i)).setShiftingMode(false);
+ }
+ //noinspection RestrictedApi
+ menuView.updateMenuView();
+ } else {
+ L.e("NavTabLayout structure not as expected! Please investigate.");
+ }
+ }
+
private void setTabViews() {
for (int i = 0; i < NavTab.size(); i++) {
NavTab navTab = NavTab.of(i);
--
To view, visit https://gerrit.wikimedia.org/r/382724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4b1eb54c33a3e6b82694ff6362f390a48309441
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
