Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218136
Change subject: Move displayHeight code to separate private method
......................................................................
Move displayHeight code to separate private method
For editing descriptions, we need to put a little bit
of new code in the constructor.
To help avoid making the constructor overly complex,
some of the code should be split up, such as the code
that sets displayHeight.
Change-Id: Id750f98ee58103f51f0f47a9c31a2d18b6946830
---
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
1 file changed, 17 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/36/218136/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index a898e8c..3b06d8c 100755
---
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -122,20 +122,10 @@
pageTitleContainer =
imageContainer.findViewById(R.id.page_title_container);
pageTitleText =
(TextView)imageContainer.findViewById(R.id.page_title_text);
pageDescriptionText =
(TextView)imageContainer.findViewById(R.id.page_description_text);
+
webview.addOnScrollChangeListener(this);
- // preload the display density, since it will be used in a lot of
places
- displayDensity = context.getResources().getDisplayMetrics().density;
-
- // get the screen height, using correct methods for different API
versions
- if (ApiUtil.hasHoneyCombMr2()) {
- Point size = new Point();
-
parentFragment.getActivity().getWindowManager().getDefaultDisplay().getSize(size);
- displayHeight = (int)(size.y / displayDensity);
- } else {
- displayHeight = (int)(parentFragment.getActivity()
- .getWindowManager().getDefaultDisplay().getHeight() /
displayDensity);
- }
+ setDisplayHeight();
webview.addOnClickListener(new ObservableWebView.OnClickListener() {
@Override
@@ -165,6 +155,21 @@
image1.setOnImageLoadListener(this);
}
+ private void setDisplayHeight() {
+ // preload the display density, since it will be used in a lot of
places
+ displayDensity = context.getResources().getDisplayMetrics().density;
+
+ // get the screen height, using correct methods for different API
versions
+ if (ApiUtil.hasHoneyCombMr2()) {
+ Point size = new Point();
+
parentFragment.getActivity().getWindowManager().getDefaultDisplay().getSize(size);
+ displayHeight = (int)(size.y / displayDensity);
+ } else {
+ displayHeight = (int)(parentFragment.getActivity()
+ .getWindowManager().getDefaultDisplay().getHeight() /
displayDensity);
+ }
+ }
+
@Override
public void onScrollChanged(int oldScrollY, int scrollY) {
LinearLayout.LayoutParams contParams = (LinearLayout.LayoutParams)
imageContainer
--
To view, visit https://gerrit.wikimedia.org/r/218136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id750f98ee58103f51f0f47a9c31a2d18b6946830
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
