From 40f42c5b8e58c8c7f16b79abe1610937af02e980 Mon Sep 17 00:00:00 2001
From: "michel.onwordi" <michel.onwordi@auto1.com>
Date: Tue, 9 Jan 2018 15:20:43 +0100
Subject: [PATCH 1/2] Remove unnecessary use of density for scaling
Additionally, improve naming.
---
.../main/java/ru/noties/markwon/spans/SpannableTheme.java | 4 ++--
.../markwon/spans/configuration/heading/HeadingConfig.kt | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
index 62eb35b1..aeffe1a0 100644
--- a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
+++ b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
@@ -114,7 +114,7 @@ public class SpannableTheme {
// taken from html spec (most browsers render headings like that)
// is not exposed via protected modifier in order to disallow modification
- private static final float[] HEADING_SIZES = {
+ private static final float[] HEADING_SCALES = {
2.F, 1.5F, 1.17F, 1.F, .83F, .67F,
};
@@ -348,7 +348,7 @@ public class SpannableTheme {
paint.setFakeBoldText(true);
final float textSize = headingTypeConfig.getTextSize() > 0 ?
- headingTypeConfig.getTextSize() : HEADING_SIZES[level - 1];
+ headingTypeConfig.getTextSize() : HEADING_SCALES[level - 1];
paint.setTextSize(paint.getTextSize() * textSize);
final int textColor = headingTypeConfig.getTextColor();
diff --git a/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
index 1e9e0c5b..e424ee3e 100644
--- a/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
+++ b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
@@ -49,16 +49,13 @@ class HeadingConfig @JvmOverloads constructor(
*/
class HeadingTypeConfig @JvmOverloads constructor(
//Standard sizes available at #SpannableTheme.java:HEADING_SIZES
- textSize: Float = -1F,
+ val textSize: Float = -1F,
@ColorInt val textColor: Int = -1,
val typeface: Typeface? = null
) {
internal var densityFactor: Float = -1F
-
- val textSize: Float = textSize
- get() = field * densityFactor
}
/**
From cc535f0c50a5913b5a5329835aec34b2d20cf1c1 Mon Sep 17 00:00:00 2001
From: "michel.onwordi" <michel.onwordi@auto1.com>
Date: Tue, 9 Jan 2018 15:59:15 +0100
Subject: [PATCH 2/2] Fix PR Comment
---
.../main/java/ru/noties/markwon/spans/SpannableTheme.java | 4 ++--
.../markwon/spans/configuration/heading/HeadingConfig.kt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
index aeffe1a0..39b85a06 100644
--- a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
+++ b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
@@ -347,8 +347,8 @@ public class SpannableTheme {
paint.setFakeBoldText(true);
- final float textSize = headingTypeConfig.getTextSize() > 0 ?
- headingTypeConfig.getTextSize() : HEADING_SCALES[level - 1];
+ final float textSize = headingTypeConfig.getTextScale() > 0 ?
+ headingTypeConfig.getTextScale() : HEADING_SCALES[level - 1];
paint.setTextSize(paint.getTextSize() * textSize);
final int textColor = headingTypeConfig.getTextColor();
diff --git a/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
index e424ee3e..7b58feb6 100644
--- a/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
+++ b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
@@ -43,13 +43,13 @@ class HeadingConfig @JvmOverloads constructor(
*
* Can set text size, text color and font (typeface)
*
- * @property textSize Text size for heading
+ * @property textScale Text scale for heading
* @property textColor Text color for heading
- * @property typeface Text size for heading
+ * @property typeface Typeface for heading
*/
class HeadingTypeConfig @JvmOverloads constructor(
//Standard sizes available at #SpannableTheme.java:HEADING_SIZES
- val textSize: Float = -1F,
+ val textScale: Float = -1F,
@ColorInt val textColor: Int = -1,