[MediaWiki-commits] [Gerrit] Extract calculating lead image width - change (apps...wikipedia)

[BearND (Code Review)]

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226674

Change subject: Extract calculating lead image width
......................................................................

Extract calculating lead image width

And make metadata (mobileview) JSON object key more generic
in preparation of a simpler switch between mobileview and mobile content 
service.

Bug: T104714
Change-Id: I5d71dee14f1e5fa4e15b3a1c1c03c3319523d33a
---
M wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
1 file changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/74/226674/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java 
b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 689eced..692f927 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -617,6 +617,7 @@
     private class LeadSectionFetchTask extends SectionsFetchTask {
         private final int startSequenceNum;
         private PageProperties pageProperties;
+        private String pagePropsResponseName = "mobileview";
 
         public LeadSectionFetchTask(int startSequenceNum) {
             super(app, model.getTitle(), "0");
@@ -629,10 +630,7 @@
             builder.param("prop", builder.getParams().get("prop")
                     + "|thumb|image|id|revision|description|"
                     + Page.API_REQUEST_PROPS);
-            Resources res = app.getResources();
-            builder.param("thumbsize",
-                    Integer.toString((int) 
(res.getDimension(R.dimen.leadImageWidth)
-                            / res.getDisplayMetrics().density)));
+            builder.param("thumbsize", 
Integer.toString(calculateLeadImageWidth()));
             return builder;
         }
 
@@ -641,10 +639,10 @@
             if (startSequenceNum != currentSequenceNum) {
                 return super.processResult(result);
             }
-            JSONObject mobileView = 
result.asObject().optJSONObject("mobileview");
-            if (mobileView != null) {
-                pageProperties = new PageProperties(mobileView);
-                
model.setTitle(fragment.adjustPageTitleFromMobileview(model.getTitle(), 
mobileView));
+            JSONObject metadata = 
result.asObject().optJSONObject(pagePropsResponseName);
+            if (metadata != null) {
+                pageProperties = new PageProperties(metadata);
+                
model.setTitle(fragment.adjustPageTitleFromMobileview(model.getTitle(), 
metadata));
             }
             return super.processResult(result);
         }
@@ -706,6 +704,12 @@
         }
     }
 
+    public int calculateLeadImageWidth() {
+        Resources res = app.getResources();
+        return (int) (res.getDimension(R.dimen.leadImageWidth)
+                / res.getDisplayMetrics().density);
+    }
+
     private class RestSectionsFetchTask extends SectionsFetchTask {
         private final int startSequenceNum;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/226674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d71dee14f1e5fa4e15b3a1c1c03c3319523d33a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits