Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277310
Change subject: Hygiene: consolidate queries for display density to a single
source.
......................................................................
Hygiene: consolidate queries for display density to a single source.
This also consolidates queries for display width and height.
Change-Id: Ie3804727b4617492b594472eec62ae4f97889787
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
M app/src/main/java/org/wikipedia/util/DimenUtil.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
17 files changed, 52 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/10/277310/1
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index f971116..3b6ee03 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -3,7 +3,6 @@
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.Application;
-import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build;
@@ -68,11 +67,6 @@
public class WikipediaApp extends Application {
private static final int EVENT_LOG_TESTING_ID = new
Random().nextInt(Integer.MAX_VALUE);
-
- private float screenDensity;
- public float getScreenDensity() {
- return screenDensity;
- }
public static final int FONT_SIZE_MULTIPLIER_MIN = -5;
public static final int FONT_SIZE_MULTIPLIER_MAX = 8;
@@ -166,9 +160,7 @@
Fresco.initialize(this);
bus = new Bus();
- final Resources resources = getResources();
- ViewAnimations.init(resources);
- screenDensity = resources.getDisplayMetrics().density;
+ ViewAnimations.init(getResources());
currentTheme = unmarshalCurrentTheme();
appLanguageState = new AppLanguageState(this);
diff --git a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
index a986285..41152f5 100644
--- a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
@@ -4,12 +4,12 @@
import org.json.JSONObject;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.util.DimenUtil;
public class PageScrollFunnel extends TimedFunnel {
private static final String SCHEMA_NAME = "MobileWikiAppPageScroll";
private static final int REV_ID = 14591606;
- private final WikipediaApp app;
private final int pageId;
private int viewportHeight;
private int pageHeight;
@@ -19,7 +19,6 @@
public PageScrollFunnel(WikipediaApp app, int pageId) {
super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ?
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
- this.app = app;
this.pageId = pageId;
}
@@ -37,7 +36,7 @@
}
public void setPageHeight(int height) {
- this.pageHeight = (int) (height * app.getScreenDensity());
+ this.pageHeight = (int) (height * DimenUtil.getDensityScalar());
}
public void setViewportHeight(int height) {
@@ -47,9 +46,9 @@
public void logDone() {
log(
"pageID", pageId,
- "pageHeight", (int) (pageHeight / app.getScreenDensity()),
- "scrollFluxDown", (int) (scrollFluxDown /
app.getScreenDensity()),
- "scrollFluxUp", (int) (scrollFluxUp / app.getScreenDensity()),
+ "pageHeight", (int) (pageHeight /
DimenUtil.getDensityScalar()),
+ "scrollFluxDown", (int) (scrollFluxDown /
DimenUtil.getDensityScalar()),
+ "scrollFluxUp", (int) (scrollFluxUp /
DimenUtil.getDensityScalar()),
"maxPercentViewed", getMaxPercentViewed()
);
}
diff --git a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index baa3643..5225445 100644
--- a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -5,6 +5,7 @@
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.pageimages.PageImagesTask;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.views.GoneIfEmptyTextView;
import org.wikipedia.views.ViewUtil;
import org.wikipedia.wikidata.GetDescriptionsTask;
@@ -63,7 +64,7 @@
app.getAPIForSite(site),
site,
titleList,
- (int)(WikipediaApp.PREFERRED_THUMB_SIZE *
WikipediaApp.getInstance().getScreenDensity())) {
+ (int)(WikipediaApp.PREFERRED_THUMB_SIZE *
DimenUtil.getDensityScalar())) {
@Override
public void onFinish(Map<PageTitle, String> result) {
for (Map.Entry<PageTitle, String> entry : result.entrySet()) {
diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 3925f41..efa4180 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -726,7 +726,7 @@
}
//give it our expected scroll position, in case we need the page
to be pre-scrolled upon loading.
wrapper.put("scrollY",
- (int) (stagedScrollY /
activity.getResources().getDisplayMetrics().density));
+ (int) (stagedScrollY / DimenUtil.getDensityScalar()));
bridge.sendMessage("displaySection", wrapper);
if (savedPage && lastSection) {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index c3dc0bc..634915a 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -63,6 +63,7 @@
import org.wikipedia.search.SearchBarHideHandler;
import org.wikipedia.settings.Prefs;
import org.wikipedia.tooltip.ToolTipUtil;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.ThrowableUtil;
import org.wikipedia.util.log.L;
@@ -94,7 +95,7 @@
private boolean errorState = false;
private static final int TOC_BUTTON_HIDE_DELAY = 2000;
- private static final int REFRESH_SPINNER_ADDITIONAL_OFFSET = (int) (16 *
WikipediaApp.getInstance().getScreenDensity());
+ private static final int REFRESH_SPINNER_ADDITIONAL_OFFSET = (int) (16 *
DimenUtil.getDensityScalar());
private PageLoadStrategy pageLoadStrategy;
private PageViewModel model;
diff --git a/app/src/main/java/org/wikipedia/page/ToCHandler.java
b/app/src/main/java/org/wikipedia/page/ToCHandler.java
index 298b511..735a16f 100755
--- a/app/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/app/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -6,6 +6,7 @@
import org.wikipedia.analytics.ToCInteractionFunnel;
import org.wikipedia.bridge.CommunicationBridge;
import org.wikipedia.tooltip.ToolTipUtil;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.views.ConfigurableListView;
import org.wikipedia.views.WikiDrawerLayout;
import org.json.JSONException;
@@ -253,7 +254,7 @@
View sectionFiller =
convertView.findViewById(R.id.page_toc_filler);
LinearLayout.LayoutParams indentLayoutParameters = new
LinearLayout.LayoutParams(sectionFiller.getLayoutParams());
- indentLayoutParameters.width = (section.getLevel() - 1) * (int)
(INDENTATION_WIDTH_DP * WikipediaApp.getInstance().getScreenDensity());
+ indentLayoutParameters.width = (section.getLevel() - 1) * (int)
(INDENTATION_WIDTH_DP * DimenUtil.getDensityScalar());
sectionFiller.setLayoutParams(indentLayoutParameters);
sectionHeading.setText(Html.fromHtml(section.getHeading()));
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 5ddca25..5a4c8f9 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -37,6 +37,7 @@
import org.wikipedia.page.PageFragment;
import org.wikipedia.page.SuggestionsTask;
import org.wikipedia.search.SearchResults;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.views.ConfigurableListView;
import org.wikipedia.views.GoneIfEmptyTextView;
import org.wikipedia.views.ObservableWebView;
@@ -60,7 +61,6 @@
private PageTitle pageTitle;
private final PageActivity activity;
private final WikipediaApp app;
- private float displayDensity;
private boolean firstTimeShown = false;
private View bottomContentContainer;
@@ -81,7 +81,6 @@
this.linkHandler = linkHandler;
activity = (PageActivity) parentFragment.getActivity();
app = (WikipediaApp) activity.getApplicationContext();
- displayDensity = activity.getResources().getDisplayMetrics().density;
bottomContentContainer = hidingView;
webview.addOnScrollChangeListener(this);
@@ -125,7 +124,7 @@
break;
case MotionEvent.ACTION_MOVE:
if (isPressed && !doingSlopEvent) {
- int contentHeight =
(int)(webView.getContentHeight() * displayDensity);
+ int contentHeight =
(int)(webView.getContentHeight() * DimenUtil.getDensityScalar());
int maxScroll = contentHeight -
webView.getScrollY()
- webView.getHeight();
int scrollAmount = Math.min((int) (startY -
event.getY()), maxScroll);
@@ -156,8 +155,6 @@
}
});
- // preload the display density, since it will be used in a lot of
places
- displayDensity = activity.getResources().getDisplayMetrics().density;
// hide ourselves by default
hide();
}
@@ -167,7 +164,7 @@
if (bottomContentContainer.getVisibility() == View.GONE) {
return;
}
- int contentHeight = (int)(webView.getContentHeight() * displayDensity);
+ int contentHeight = (int)(webView.getContentHeight() *
DimenUtil.getDensityScalar());
int bottomOffset = contentHeight - scrollY - webView.getHeight();
int bottomHeight = bottomContentContainer.getHeight();
CoordinatorLayout.LayoutParams params =
(CoordinatorLayout.LayoutParams) bottomContentContainer.getLayoutParams();
@@ -254,7 +251,7 @@
int totalHeight = bottomContentContainer.getMeasuredHeight();
JSONObject payload = new JSONObject();
try {
- payload.put("paddingBottom", (int)(totalHeight / displayDensity));
+ payload.put("paddingBottom", (int)(totalHeight /
DimenUtil.getDensityScalar()));
} catch (JSONException e) {
throw new RuntimeException(e);
}
@@ -315,7 +312,7 @@
final long timeMillis = System.currentTimeMillis();
new SuggestionsTask(app.getAPIForSite(myTitle.getSite()),
myTitle.getSite(),
myTitle.getPrefixedText(), numRequestItems, maxResultItems,
-
(int)(parentFragment.getActivity().getResources().getDimension(R.dimen.leadImageWidth)
/ displayDensity), false) {
+
(int)(parentFragment.getActivity().getResources().getDimension(R.dimen.leadImageWidth)
/ DimenUtil.getDensityScalar()), false) {
@Override
public void onFinish(SearchResults results) {
funnel.setLatency(System.currentTimeMillis() - timeMillis);
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index d634acf..5a9f433 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -57,7 +57,6 @@
private int displayHeightDp;
private float faceYOffsetNormalized;
- private float displayDensity;
public LeadImagesHandler(@NonNull final PageFragment parentFragment,
@NonNull CommunicationBridge bridge,
@@ -193,9 +192,9 @@
private void updatePadding() {
int padding;
if (isMainPage()) {
- padding = Math.round(getContentTopOffsetPx(getActivity()) /
displayDensity);
+ padding = Math.round(getContentTopOffsetPx(getActivity()) /
DimenUtil.getDensityScalar());
} else {
- padding = Math.round(articleHeaderView.getHeight() /
displayDensity);
+ padding = Math.round(articleHeaderView.getHeight() /
DimenUtil.getDensityScalar());
}
setWebViewPaddingTop(padding);
@@ -233,15 +232,10 @@
}
/**
- * Determines and sets displayDensity and displayHeightDp for the lead
images layout.
+ * Determines and sets displayHeightDp for the lead images layout.
*/
private void initDisplayDimensions() {
- // preload the display density, since it will be used in a lot of
places
- displayDensity = DimenUtil.getDensityScalar();
-
- int displayHeightPx = DimenUtil.getDisplayHeightPx();
-
- displayHeightDp = (int) (displayHeightPx / displayDensity);
+ displayHeightDp = (int) (DimenUtil.getDisplayHeightPx() /
DimenUtil.getDensityScalar());
}
private void loadLeadImage() {
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index f64e0fa..c9a5ea2 100644
---
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -1,6 +1,7 @@
package org.wikipedia.page.linkpreview;
import org.wikipedia.R;
+import org.wikipedia.util.DimenUtil;
import android.app.Dialog;
import android.content.res.Configuration;
@@ -10,7 +11,6 @@
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
-import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -196,18 +196,12 @@
}
protected int dialogWidthPx() {
- return Math.min(getDisplayMetrics().widthPixels,
+ return Math.min(DimenUtil.getDisplayWidthPx(),
(int)
getResources().getDimension(R.dimen.swipeableDialogMaxWidth));
}
private int dialogHeightPx() {
- return getDisplayMetrics().heightPixels -
getStatusBarHeightPx(getActivity());
- }
-
- protected DisplayMetrics getDisplayMetrics() {
- DisplayMetrics metrics = new DisplayMetrics();
-
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
- return metrics;
+ return DimenUtil.getDisplayHeightPx() -
getStatusBarHeightPx(getActivity());
}
private static final class SwipeableAdapter extends BaseAdapter {
diff --git a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
index e735fd3..d7190b8 100644
--- a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
+++ b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
@@ -4,6 +4,7 @@
import org.wikipedia.page.PageActivity;
import org.wikipedia.page.PageBackStackItem;
import org.wikipedia.page.PageTitle;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.views.ViewUtil;
import com.facebook.drawee.view.SimpleDraweeView;
@@ -38,7 +39,6 @@
}
private PageActivity parentActivity;
- private float displayDensity;
private View pageContentView;
private View tabContainerView;
@@ -61,7 +61,6 @@
public TabsProvider(PageActivity parentActivity, List<Tab> tabList) {
this.parentActivity = parentActivity;
this.tabList = tabList;
- displayDensity =
parentActivity.getResources().getDisplayMetrics().density;
pageContentView = parentActivity.getContentView();
tabContainerView = parentActivity.getTabsContainerView();
@@ -295,7 +294,7 @@
int contentOffset = getContentTopOffsetPx(parentActivity);
int maxHeight = (int) (pageContentView.getHeight() * proportionVert
+ pageContentView.getHeight() * proportionHorz
- - contentOffset - heightOffset * displayDensity);
+ - contentOffset - heightOffset * DimenUtil.getDensityScalar());
FrameLayout.LayoutParams params = new
FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, maxHeight);
float margin = pageContentView.getWidth() * proportionHorz / 2f;
params.leftMargin = (int) margin;
diff --git a/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
b/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
index 078a0c6..5127097 100644
--- a/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
+++ b/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
@@ -14,6 +14,7 @@
import org.wikipedia.R;
import org.wikipedia.ViewAnimations;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.GradientUtil;
import org.wikipedia.views.ObservableWebView;
@@ -22,7 +23,6 @@
ObservableWebView.OnDownMotionEventListener {
private static final int FULL_OPACITY = 255;
@NonNull private final View quickReturnView;
- private final float displayDensity;
@NonNull private final Context context;
@Nullable private ObservableWebView webview;
@@ -36,7 +36,6 @@
public SearchBarHideHandler(@NonNull Activity activity, @NonNull View
quickReturnView) {
context = activity;
this.quickReturnView = quickReturnView;
- this.displayDensity = getResources().getDisplayMetrics().density;
LayerDrawable toolbarBackgroundLayers = (LayerDrawable) quickReturnView
.findViewById(R.id.main_toolbar_background_container).getBackground();
@@ -161,7 +160,7 @@
final int fadeHeight = 256;
int opacity = FULL_OPACITY;
if (fadeEnabled && !forceNoFade) {
- opacity = scrollY * FULL_OPACITY / (int) (fadeHeight *
displayDensity);
+ opacity = scrollY * FULL_OPACITY / (int) (fadeHeight *
DimenUtil.getDensityScalar());
}
opacity = Math.max(0, opacity);
opacity = Math.min(FULL_OPACITY, opacity);
diff --git a/app/src/main/java/org/wikipedia/util/DimenUtil.java
b/app/src/main/java/org/wikipedia/util/DimenUtil.java
index 4cebc26..77ffb5a 100644
--- a/app/src/main/java/org/wikipedia/util/DimenUtil.java
+++ b/app/src/main/java/org/wikipedia/util/DimenUtil.java
@@ -16,6 +16,8 @@
return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
getDisplayMetrics());
}
+ private static Float DENSITY_SCALAR;
+
public static int roundedDpToPx(float dp) {
return Math.round(dpToPx(dp));
}
@@ -29,7 +31,10 @@
}
public static float getDensityScalar() {
- return getDisplayMetrics().density;
+ if (DENSITY_SCALAR == null) {
+ DENSITY_SCALAR = getDisplayMetrics().density;
+ }
+ return DENSITY_SCALAR;
}
public static float getFloat(@DimenRes int id) {
@@ -60,13 +65,13 @@
// TODO: use getResources().getDimensionPixelSize()? Define
leadImageWidth with px, not dp?
public static int calculateLeadImageWidth() {
Resources res = WikipediaApp.getInstance().getResources();
- return (int) (res.getDimension(R.dimen.leadImageWidth) /
res.getDisplayMetrics().density);
+ return (int) (res.getDimension(R.dimen.leadImageWidth) /
getDensityScalar());
}
- /**
- * Gets the screen height in pixels.
- * @return screen height in pixels
- */
+ public static int getDisplayWidthPx() {
+ return getDisplayMetrics().widthPixels;
+ }
+
public static int getDisplayHeightPx() {
return getDisplayMetrics().heightPixels;
}
diff --git a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
index c249038..f6e4657 100755
--- a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
+++ b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
@@ -9,6 +9,8 @@
import android.webkit.WebView;
import org.wikipedia.WikipediaApp;
import org.wikipedia.events.WebViewInvalidateEvent;
+import org.wikipedia.util.DimenUtil;
+
import android.graphics.Canvas;
import java.util.ArrayList;
import java.util.List;
@@ -34,13 +36,13 @@
/**
* Threshold (in pixels) of continuous scrolling, to be considered "fast"
scrolling.
*/
- private static final int FAST_SCROLL_THRESHOLD = (int) (1000 *
WikipediaApp.getInstance().getScreenDensity());
+ private static final int FAST_SCROLL_THRESHOLD = (int) (1000 *
DimenUtil.getDensityScalar());
/**
* Maximum single scroll amount (in pixels) to be considered a "human"
scroll.
* Otherwise it's probably a programmatic scroll, which we won't count.
*/
- private static final int MAX_HUMAN_SCROLL = (int) (500 *
WikipediaApp.getInstance().getScreenDensity());
+ private static final int MAX_HUMAN_SCROLL = (int) (500 *
DimenUtil.getDensityScalar());
/**
* Maximum amount of time that needs to elapse before the previous scroll
amount
diff --git a/app/src/main/java/org/wikipedia/views/ViewUtil.java
b/app/src/main/java/org/wikipedia/views/ViewUtil.java
index 3d9a023..ede9913 100644
--- a/app/src/main/java/org/wikipedia/views/ViewUtil.java
+++ b/app/src/main/java/org/wikipedia/views/ViewUtil.java
@@ -19,6 +19,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.util.ApiUtil;
+import org.wikipedia.util.DimenUtil;
import java.lang.reflect.Field;
@@ -43,7 +44,7 @@
public static void setBottomPaddingDp(View view, int padding) {
view.setPadding(view.getPaddingLeft(), view.getPaddingTop(),
view.getPaddingRight(),
- (int) (padding *
view.getContext().getResources().getDisplayMetrics().density));
+ (int) (padding * DimenUtil.getDensityScalar()));
}
public static void setAnimationMatrix(View view, Animation animation) {
diff --git
a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
index c1c7063..7136597 100644
--- a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
+++ b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
@@ -22,6 +22,7 @@
import org.wikipedia.server.PageService;
import org.wikipedia.server.PageServiceFactory;
import org.wikipedia.staticdata.MainPageNameData;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.log.L;
import retrofit.RetrofitError;
@@ -126,7 +127,7 @@
private int calculateLeadImageWidth() {
Resources res = WikipediaApp.getInstance().getResources();
- return (int) (res.getDimension(R.dimen.leadImageWidth) /
res.getDisplayMetrics().density);
+ return (int) (res.getDimension(R.dimen.leadImageWidth) /
DimenUtil.getDensityScalar());
}
private PageService getApiService(PageTitle title) {
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 8b94230..8a8ec91 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -23,6 +23,7 @@
import org.wikipedia.server.PageService;
import org.wikipedia.server.restbase.RbPageService;
import org.wikipedia.server.restbase.RbDefinition;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.log.L;
import org.wikipedia.views.AppTextView;
@@ -70,7 +71,7 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setStyle(STYLE_NO_TITLE, R.style.LinkPreviewDialog);
- int peekHeight = getDisplayMetrics().heightPixels /
PEEK_HEIGHT_DIVISOR;
+ int peekHeight = DimenUtil.getDisplayHeightPx() / PEEK_HEIGHT_DIVISOR;
setContentPeekHeight(peekHeight);
}
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 2a32dda..dc85ced 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -7,6 +7,7 @@
import org.wikipedia.random.RandomArticleIdTask;
import org.mediawiki.api.json.ApiResult;
import org.mediawiki.api.json.OnHeaderCheckListener;
+import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.StringUtil;
import org.wikipedia.util.UriUtil;
@@ -52,7 +53,7 @@
/**
* Height of the Zero banner, in pixels, that will pop up from the bottom
of the screen.
*/
- private static final int BANNER_HEIGHT = (int) (120 *
WikipediaApp.getInstance().getScreenDensity());
+ private static final int BANNER_HEIGHT = (int) (120 *
DimenUtil.getDensityScalar());
private WikipediaApp app;
--
To view, visit https://gerrit.wikimedia.org/r/277310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3804727b4617492b594472eec62ae4f97889787
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
