jenkins-bot has submitted this change and it was merged.
Change subject: Add Feed nav drawer entry and dev setting
......................................................................
Add Feed nav drawer entry and dev setting
Add Feed navigation drawer entry, a developer toggle (defaults true for
dev flavor), and TODOs for missing tie ins. Text and icon are not final.
Bug: T129078
Change-Id: Ib30623d9b6980ffa07b0ce4051e552201dfd859a
---
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/menu/menu_nav_drawer.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
M app/src/main/res/xml/developer_preferences.xml
7 files changed, 35 insertions(+), 1 deletion(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
index c2fd99d..776334a 100644
--- a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
+++ b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
@@ -24,6 +24,7 @@
import org.wikipedia.nearby.NearbyFragment;
import org.wikipedia.random.RandomHandler;
import org.wikipedia.readinglist.ReadingListsFragment;
+import org.wikipedia.settings.Prefs;
import org.wikipedia.settings.SettingsActivity;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.UriUtil;
@@ -63,6 +64,10 @@
updateWikipediaZeroStatus();
accountToggle = false;
updateMenuGroupToggle();
+
+ if (!Prefs.enableFeed()) {
+
activity.getNavMenu().findItem(R.id.nav_item_feed).setVisible(false);
+ }
}
public NavigationView.OnNavigationItemSelectedListener getNewListener() {
@@ -70,6 +75,10 @@
@Override
public boolean onNavigationItemSelected(MenuItem menuItem) {
switch (menuItem.getItemId()) {
+ case R.id.nav_item_feed:
+ // TODO: [Feed] show Feed Fragment.
+ // TODO: [Feed] add Feed logging.
+ break;
case R.id.nav_item_today:
activity.loadMainPageInCurrentTab();
funnel.logToday();
@@ -189,7 +198,10 @@
}
@Nullable @IdRes private Integer fragmentToMenuId(Class<? extends
Fragment> fragment) {
- if (fragment == PageFragment.class) {
+ // TODO: [Feed] add Feed Fragment.
+ /*if (fragment == FeedFragment.class) {
+ return R.id.nav_item_feed;
+ } else*/ if (fragment == PageFragment.class) {
return R.id.nav_item_today;
} else if (fragment == HistoryFragment.class) {
return R.id.nav_item_history;
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 794c9b1..b1ab708 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -138,6 +138,10 @@
remove(getEditTokenForWikiKey(wiki));
}
+ public static boolean enableFeed() {
+ return getBoolean(R.string.preference_key_enable_feed, isDevRelease());
+ }
+
public static void removeLoginUsername() {
remove(R.string.preference_key_login_username);
}
diff --git a/app/src/main/res/menu/menu_nav_drawer.xml
b/app/src/main/res/menu/menu_nav_drawer.xml
index 2f692dd..85e4622 100644
--- a/app/src/main/res/menu/menu_nav_drawer.xml
+++ b/app/src/main/res/menu/menu_nav_drawer.xml
@@ -3,6 +3,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:tools="http://schemas.android.com/tools";>
<group android:id="@+id/group_main">
+ <item android:id="@+id/nav_item_feed"
+ android:title="@string/nav_item_feed"
+ android:icon="@drawable/ic_list_white_24dp"
+ android:checkable="true"
+ />
<item android:id="@+id/nav_item_today"
android:title="@string/nav_item_today"
android:icon="@drawable/ic_wb_sunny_black_24dp"
diff --git a/app/src/main/res/values/preference_keys.xml
b/app/src/main/res/values/preference_keys.xml
index 503fbd7..d6ac500 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -41,4 +41,5 @@
<string name="preference_key_remote_log">remoteLog</string>
<!-- Note: this value _must_ match
net.hockeyapp.android.CrashManager.ALWAYS_SEND_KEY. -->
<string
name="preference_key_auto_upload_crash_reports">always_send_crash_reports</string>
+ <string name="preference_key_enable_feed">enableFeed</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 4fdea9d..06dd0e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -310,4 +310,8 @@
<!-- User options -->
<string name="user_option_sync_label">Preferences</string>
<!-- /User options -->
+
+ <!-- The Feed -->
+ <!-- TODO: [Feed] move translatable strings here. -->
+ <!-- /The Feed -->
</resources>
diff --git a/app/src/main/res/values/strings_no_translate.xml
b/app/src/main/res/values/strings_no_translate.xml
index 02a6123..a9b74d2 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -40,4 +40,8 @@
<string name="hockeyapp_crash_dialog_positive_button"
tools:ignore="UnusedResources">@string/crash_report_dialog_send_button</string>
<!-- /Crash reporter -->
+ <!-- The Feed -->
+ <!-- TODO: [Feed] move translatable strings to strings.xml. -->
+ <string name="nav_item_feed">Home</string>
+ <!-- /The Feed -->
</resources>
diff --git a/app/src/main/res/xml/developer_preferences.xml
b/app/src/main/res/xml/developer_preferences.xml
index e0f2c72..f260265 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -151,6 +151,10 @@
android:key="@string/preference_key_show_developer_settings"
android:title="@string/preference_key_show_developer_settings" />
+ <SwitchPreferenceCompat
+ android:key="@string/preference_key_enable_feed"
+ android:title="@string/preference_key_enable_feed" />
+
<Preference android:key="@string/preferences_developer_crash_key"
android:title="@string/preferences_developer_crash_title"
android:summary="@string/preferences_developer_crash_summary" />
--
To view, visit https://gerrit.wikimedia.org/r/289790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib30623d9b6980ffa07b0ce4051e552201dfd859a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
