jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405310 )
Change subject: Follow-up: simplify some logic in RandomItemFragment.
......................................................................
Follow-up: simplify some logic in RandomItemFragment.
Change-Id: I265fa9d8258af7b419a1d24b5e098e70b94582fc
---
M app/src/main/java/org/wikipedia/random/RandomItemFragment.java
1 file changed, 16 insertions(+), 28 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
index 3edf683..b507fee 100644
--- a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
+++ b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
@@ -35,11 +35,8 @@
@BindView(R.id.view_featured_article_card_extract) TextView extractView;
@BindView(R.id.random_item_error_view) WikiErrorView errorView;
-
@Nullable private RbPageSummary summary;
private int pagerPosition = -1;
- private View view;
- private boolean loadComplete;
@NonNull
public static RandomItemFragment newInstance() {
@@ -55,7 +52,7 @@
}
public boolean isLoadComplete() {
- return loadComplete;
+ return summary != null;
}
@Override
@@ -68,35 +65,30 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
-
- if (view == null || !containsData()) {
- view = inflater.inflate(R.layout.fragment_random_item, container,
false);
- ButterKnife.bind(this, view);
- imageView.setLegacyVisibilityHandlingEnabled(true);
- setContents(null);
- errorView.setBackClickListener(v -> getActivity().finish());
- errorView.setRetryClickListener(v -> {
- progressBar.setVisibility(View.VISIBLE);
- getRandomPage();
- });
+ View view = inflater.inflate(R.layout.fragment_random_item, container,
false);
+ ButterKnife.bind(this, view);
+ imageView.setLegacyVisibilityHandlingEnabled(true);
+ errorView.setBackClickListener(v -> getActivity().finish());
+ errorView.setRetryClickListener(v -> {
+ progressBar.setVisibility(View.VISIBLE);
+ getRandomPage();
+ });
+ updateContents();
+ if (summary == null) {
getRandomPage();
}
return view;
- }
-
- private boolean containsData() {
- return !(TextUtils.isEmpty(articleTitleView.getText().toString()) ||
TextUtils.isEmpty(extractView.getText().toString()));
}
private void getRandomPage() {
new
RandomSummaryClient().request(WikipediaApp.getInstance().getWikiSite(), new
RandomSummaryClient.Callback() {
@Override
public void onSuccess(@NonNull Call<RbPageSummary> call, @NonNull
RbPageSummary pageSummary) {
- loadComplete = true;
+ summary = pageSummary;
if (!isAdded()) {
return;
}
- setContents(pageSummary);
+ updateContents();
parent().onChildLoaded();
}
@@ -124,14 +116,10 @@
}
}
- public void setContents(@Nullable RbPageSummary pageSummary) {
+ public void updateContents() {
errorView.setVisibility(View.GONE);
- containerView.setVisibility(pageSummary == null ? View.GONE :
View.VISIBLE);
- progressBar.setVisibility(pageSummary == null ? View.VISIBLE :
View.GONE);
- if (summary == pageSummary) {
- return;
- }
- summary = pageSummary;
+ containerView.setVisibility(summary == null ? View.GONE :
View.VISIBLE);
+ progressBar.setVisibility(summary == null ? View.VISIBLE : View.GONE);
if (summary == null) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/405310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I265fa9d8258af7b419a1d24b5e098e70b94582fc
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
