fix(android): line-height (NativeScript#8751)

NathanWalker · web-flow · commit 4708ff4e6806 · 2020-08-07T08:46:42.000-07:00
diff --git a/nativescript-core/package.json b/nativescript-core/package.json
@@ -3,7 +3,7 @@
     "main": "index",
     "types": "index.d.ts",
     "description": "NativeScript Core Modules",
-    "version": "6.5.12",
+    "version": "6.5.13",
     "homepage": "https://www.nativescript.org",
     "repository": {
         "type": "git",
diff --git a/nativescript-core/ui/text-base/text-base.android.ts b/nativescript-core/ui/text-base/text-base.android.ts
@@ -334,11 +334,10 @@ export class TextBase extends TextBaseCommon {
     }
 
     [lineHeightProperty.getDefault](): number {
-        return this.nativeTextViewProtected.getLineHeight() / layout.getDisplayDensity();
+        return this.nativeView.getLineSpacingExtra() / layout.getDisplayDensity();
     }
     [lineHeightProperty.setNative](value: number) {
-        const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
-        this.nativeTextViewProtected.setLineSpacing(Math.max(value - fontHeight, 0) * layout.getDisplayDensity(), 1);
+        this.nativeView.setLineSpacing(value * layout.getDisplayDensity(), 1);
     }
 
     [fontInternalProperty.getDefault](): android.graphics.Typeface {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "NativeScript",
   "description": "NativeScript Core Modules",
   "homepage": "https://www.nativescript.org",
-  "version": "6.5.12",
+  "version": "6.5.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/NativeScript"
diff --git a/tns-core-modules-package/package.json b/tns-core-modules-package/package.json
@@ -3,7 +3,7 @@
     "main": "index",
     "types": "index.d.ts",
     "description": "NativeScript Core Modules",
-    "version": "6.5.12",
+    "version": "6.5.13",
     "homepage": "https://www.nativescript.org",
     "repository": {
         "type": "git",
diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tns-platform-declarations",
-    "version": "6.5.12",
+    "version": "6.5.13",
     "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
     "main": "",
     "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -334,11 +334,10 @@ export class TextBase extends TextBaseCommon {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`[lineHeightProperty.getDefault](): number {`
`337`		`- return this.nativeTextViewProtected.getLineHeight() / layout.getDisplayDensity();`
	`337`	`+ return this.nativeView.getLineSpacingExtra() / layout.getDisplayDensity();`
`338`	`338`	`}`
`339`	`339`	`[lineHeightProperty.setNative](value: number) {`
`340`		`- const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);`
`341`		`- this.nativeTextViewProtected.setLineSpacing(Math.max(value - fontHeight, 0) * layout.getDisplayDensity(), 1);`
	`340`	`+ this.nativeView.setLineSpacing(value * layout.getDisplayDensity(), 1);`
`342`	`341`	`}`
`343`	`342`
`344`	`343`	`[fontInternalProperty.getDefault](): android.graphics.Typeface {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tns-platform-declarations",`
`3`		`- "version": "6.5.12",`
	`3`	`+ "version": "6.5.13",`
`4`	`4`	`"description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",`
`5`	`5`	`"main": "",`
`6`	`6`	`"scripts": {`