From ab1f64feef9d73173cbe3f82d6f8e7586dbc7215 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Wed, 20 May 2015 16:24:13 +0200 Subject: [PATCH 1/2] Introduce our version of MarkView --- .../main/java/org/wordpress/android/util/DisplayUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java index fd4cbb5df5be..40a017e9a336 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java @@ -38,6 +38,12 @@ public static int getDisplayPixelHeight(Context context) { return (size.y); } + public static float spToPx(Context context, float sp){ + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + final float scale = displayMetrics.scaledDensity; + return sp * scale; + } + public static int dpToPx(Context context, int dp) { float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics()); From 9431ed1fa315b722dcc7c26012b7129d6bc14a6d Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Tue, 9 Jun 2015 10:12:54 -0400 Subject: [PATCH 2/2] Updated support library and build tools --- WordPressUtils/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle index 8f6dc2dedfe6..dc80aaa15631 100644 --- a/WordPressUtils/build.gradle +++ b/WordPressUtils/build.gradle @@ -18,19 +18,19 @@ repositories { dependencies { compile 'commons-lang:commons-lang:2.6' compile 'com.mcxiaoke.volley:library:1.0.10' - compile 'com.android.support:support-v13:21.0.3' + compile 'com.android.support:support-v13:22.2.0' } android { publishNonDefault true - compileSdkVersion 19 - buildToolsVersion "21.1.1" + compileSdkVersion 22 + buildToolsVersion '22.0.1' defaultConfig { versionName "1.5.0" minSdkVersion 14 - targetSdkVersion 19 + targetSdkVersion 22 } }