jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404676 )
Change subject: Follow-up: hygiene - make names more descriptive.
......................................................................
Follow-up: hygiene - make names more descriptive.
Please make names more descriptive in future patches.
Change-Id: I35edb75ab714abeb2d124af00ddbeb70fca5a341
---
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
3 files changed, 13 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index b9306be..bd141da 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -216,7 +216,7 @@
if (readingList.pages().size() >=
Constants.MAX_READING_LIST_ARTICLE_LIMIT) {
String message =
String.format(getString(R.string.reading_list_article_limit_message),
readingList.isDefault() ? getString(R.string.default_reading_list_name) :
readingList.title());
- showViewListSnackBar(readingList, message, false);
+ FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT).show();
dismiss();
return;
}
@@ -230,7 +230,7 @@
String message;
if (exists) {
message = getString(R.string.reading_list_already_exists);
- showViewListSnackBar(readingList, message, true);
+ showViewListSnackBar(readingList, message);
} else {
message =
String.format(getString(R.string.reading_list_added_to_named),
@@ -238,7 +238,7 @@
new
ReadingListsFunnel(title.getWikiSite()).logAddToList(readingList,
readingLists.size(), invokeSource);
ReadingListDbHelper.instance().addPageToList(readingList,
title, true);
- showViewListSnackBar(readingList, message, true);
+ showViewListSnackBar(readingList, message);
}
dismiss();
@@ -250,7 +250,7 @@
if ((readingList.pages().size() + titles.size()) >
Constants.MAX_READING_LIST_ARTICLE_LIMIT) {
String message =
String.format(getString(R.string.reading_list_article_limit_message),
readingList.isDefault() ? getString(R.string.default_reading_list_name) :
readingList.title());
- showViewListSnackBar(readingList, message, false);
+ FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT).show();
dismiss();
return;
}
@@ -274,19 +274,15 @@
readingList.isDefault() ?
getString(R.string.default_reading_list_name) : readingList.title());
new ReadingListsFunnel().logAddToList(readingList,
readingLists.size(), invokeSource);
}
- showViewListSnackBar(readingList, message, true);
+ showViewListSnackBar(readingList, message);
dismiss();
}
});
}
- private void showViewListSnackBar(@NonNull final ReadingList list,
@NonNull String message, boolean showActionButton) {
- if (showActionButton) {
- FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT)
- .setAction(R.string.reading_list_added_view_button, v ->
v.getContext().startActivity(ReadingListActivity.newIntent(v.getContext(),
list))).show();
- } else {
- FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT).show();
- }
+ private void showViewListSnackBar(@NonNull final ReadingList list,
@NonNull String message) {
+ FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT)
+ .setAction(R.string.reading_list_added_view_button, v ->
v.getContext().startActivity(ReadingListActivity.newIntent(v.getContext(),
list))).show();
}
private class ReadingListItemCallback implements
ReadingListItemView.Callback {
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index 3d60794..18e83cb 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -97,7 +97,7 @@
@NonNull private List<ReadingListPage> displayedPages = new ArrayList<>();
private String currentSearchQuery;
- private boolean messageShown = false;
+ private boolean articleLimitMessageShown = false;
@NonNull
public static ReadingListFragment newInstance(long listId) {
@@ -232,10 +232,10 @@
headerImageView.setReadingList(readingList);
ReadingList.sort(readingList,
Prefs.getReadingListPageSortMode(ReadingList.SORT_BY_NAME_ASC));
setSearchQuery(currentSearchQuery);
- if (!messageShown && readingList.pages().size() >=
Constants.MAX_READING_LIST_ARTICLE_LIMIT) {
+ if (!articleLimitMessageShown && readingList.pages().size() >=
Constants.MAX_READING_LIST_ARTICLE_LIMIT) {
String message =
String.format(getString(R.string.reading_list_article_limit_message),
readingList.isDefault() ? getString(R.string.default_reading_list_name) :
readingList.title());
FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT).show();
- messageShown = true;
+ articleLimitMessageShown = true;
}
}
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 7d72052..52d6c53 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -198,7 +198,7 @@
}
swipeRefreshLayout.setRefreshing(false);
readingLists = lists;
- showMessage();
+ maybeShowListLimitMessage();
sortLists();
updateEmptyState(searchQuery);
maybeDeleteListFromIntent();
@@ -206,7 +206,7 @@
});
}
- private void showMessage() {
+ private void maybeShowListLimitMessage() {
if (getUserVisibleHint() && readingLists.size() >=
Constants.MAX_READING_LISTS_LIMIT) {
String message = getString(R.string.reading_lists_limit_message);
FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT).show();
--
To view, visit https://gerrit.wikimedia.org/r/404676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35edb75ab714abeb2d124af00ddbeb70fca5a341
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
