jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364321 )
Change subject: Hygiene: bulk actions follow-up.
......................................................................
Hygiene: bulk actions follow-up.
Change-Id: I880216d82f64d99f451707b8d3fb5abf6ce62883
---
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/views/MultiSelectActionModeCallback.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
6 files changed, 9 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index e075793..7f6ab17 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -64,7 +64,6 @@
import org.wikipedia.util.log.L;
import java.io.File;
-import java.util.Collections;
import java.util.concurrent.TimeUnit;
import butterknife.BindView;
@@ -249,7 +248,7 @@
@NonNull final
FeaturedArticleCard card,
@NonNull HistoryEntry
entry) {
bottomSheetPresenter.show(getChildFragmentManager(),
-
AddToReadingListDialog.newInstance(Collections.singletonList(entry.getTitle()),
+ AddToReadingListDialog.newInstance(entry.getTitle(),
AddToReadingListDialog.InvokeSource.FEED,
new DialogInterface.OnDismissListener() {
@Override public void onDismiss(DialogInterface
dialogInterface) {
diff --git
a/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
b/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
index 7a37cd8..ba79089 100644
--- a/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
+++ b/app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
@@ -9,21 +9,19 @@
import org.wikipedia.readinglist.AddToReadingListDialog;
-import java.util.Collections;
-
public class ExclusiveBottomSheetPresenter {
private static final String BOTTOM_SHEET_FRAGMENT_TAG =
"bottom_sheet_fragment";
private Dialog currentDialog;
public void showAddToListDialog(@NonNull FragmentManager fm, @NonNull
PageTitle title,
@NonNull
AddToReadingListDialog.InvokeSource source) {
- show(fm,
AddToReadingListDialog.newInstance(Collections.singletonList(title), source,
null));
+ show(fm, AddToReadingListDialog.newInstance(title, source));
}
public void showAddToListDialog(@NonNull FragmentManager fm, @NonNull
PageTitle title,
@NonNull
AddToReadingListDialog.InvokeSource source,
@Nullable
DialogInterface.OnDismissListener listener) {
- show(fm,
AddToReadingListDialog.newInstance(Collections.singletonList(title), source,
listener));
+ show(fm, AddToReadingListDialog.newInstance(title, source, listener));
}
public void show(@NonNull FragmentManager manager, @NonNull DialogFragment
dialog) {
diff --git
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index c46e3c6..3c7ed6e 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -74,7 +74,12 @@
private ReadingListItemCallback listItemCallback = new
ReadingListItemCallback();
public static AddToReadingListDialog newInstance(@NonNull PageTitle title,
InvokeSource source) {
- return newInstance(Collections.singletonList(title), source, null);
+ return newInstance(title, source, null);
+ }
+
+ public static AddToReadingListDialog newInstance(@NonNull PageTitle title,
InvokeSource source,
+ @Nullable
DialogInterface.OnDismissListener listener) {
+ return newInstance(Collections.singletonList(title), source, listener);
}
public static AddToReadingListDialog newInstance(@NonNull List<PageTitle>
titles, InvokeSource source) {
diff --git
a/app/src/main/java/org/wikipedia/views/MultiSelectActionModeCallback.java
b/app/src/main/java/org/wikipedia/views/MultiSelectActionModeCallback.java
index a3744d5..457002b 100644
--- a/app/src/main/java/org/wikipedia/views/MultiSelectActionModeCallback.java
+++ b/app/src/main/java/org/wikipedia/views/MultiSelectActionModeCallback.java
@@ -36,10 +36,6 @@
protected abstract void onDeleteSelected();
- protected String getTag() {
- return ACTION_MODE_TAG;
- }
-
@Override
public void onDestroyActionMode(ActionMode mode) {
}
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index aae1fde..c97ec17 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -336,7 +336,6 @@
<string name="reading_list_login_reminder_text">Text for a tutorial card
that reminds the user that logging in will enable syncing of reading
lists.</string>
<string name="reading_lists_confirm_remote_delete">Warning message shown to
a user to confirm that remotely stored reading list data used for syncing
across devices should be deleted.</string>
<string name="reading_list_article_save_in_progress">Message shown when the
article is in the process of being downloaded, and is not yet available for
offline access.</string>
- <string name="reading_list_action_menu_overflow_label">Label for a menu
containing actions that may be performed on reading list entries selected by
the user</string>
<string name="reading_list_action_menu_remove_from_offline">Label for a menu
option allowing the user to remove selected articles from offline
storage</string>
<string name="reading_list_action_menu_save_for_offline">Label for a menu
option allowing the user to save article content for offline
availability</string>
<string name="reading_list_action_menu_add_to_another_list">Label for a menu
option allowing the user to add the selected articles to another reading
list</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index daacc58..d446d64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -321,7 +321,6 @@
<string name="reading_list_menu_delete">Delete list</string>
<string name="reading_list_menu_rename">Rename</string>
<string name="reading_list_menu_edit_description">Edit description</string>
- <string name="reading_list_action_menu_overflow_label">More
options</string>
<string name="reading_list_action_menu_remove_from_offline">Remove from
offline</string>
<string name="reading_list_action_menu_save_for_offline">Save for
offline</string>
<string name="reading_list_action_menu_add_to_another_list">Add to another
list</string>
--
To view, visit https://gerrit.wikimedia.org/r/364321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I880216d82f64d99f451707b8d3fb5abf6ce62883
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
