the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bug] Remove density scaling logic in header config

Browse Source
This commit is contained in:
michel.onwordi 2018-01-09 17:52:23 +01:00
commit 9f1ac87b71
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
View File

@ -114,7 +114,7 @@ public class SpannableTheme {
// taken from html spec (most browsers render headings like that) // taken from html spec (most browsers render headings like that)
// is not exposed via protected modifier in order to disallow modification // 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, 2.F, 1.5F, 1.17F, 1.F, .83F, .67F,
}; };
@ -347,8 +347,8 @@ public class SpannableTheme {
paint.setFakeBoldText(true); paint.setFakeBoldText(true);
final float textSize = headingTypeConfig.getTextSize() > 0 ? final float textSize = headingTypeConfig.getTextScale() > 0 ?
headingTypeConfig.getTextSize() : HEADING_SIZES[level - 1]; headingTypeConfig.getTextScale() : HEADING_SCALES[level - 1];
paint.setTextSize(paint.getTextSize() * textSize); paint.setTextSize(paint.getTextSize() * textSize);
final int textColor = headingTypeConfig.getTextColor(); final int textColor = headingTypeConfig.getTextColor();

9
library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
View File

@ -43,22 +43,19 @@ class HeadingConfig @JvmOverloads constructor(
* *
* Can set text size, text color and font (typeface) * 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 textColor Text color for heading
* @property typeface Text size for heading * @property typeface Typeface for heading
*/ */
class HeadingTypeConfig @JvmOverloads constructor( class HeadingTypeConfig @JvmOverloads constructor(
//Standard sizes available at #SpannableTheme.java:HEADING_SIZES //Standard sizes available at #SpannableTheme.java:HEADING_SIZES
textSize: Float = -1F, val textScale: Float = -1F,
@ColorInt val textColor: Int = -1, @ColorInt val textColor: Int = -1,
val typeface: Typeface? = null val typeface: Typeface? = null
) { ) {
internal var densityFactor: Float = -1F internal var densityFactor: Float = -1F
val textSize: Float = textSize
get() = field * densityFactor
} }
/** /**