javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-04 21:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Corrected font-weight support for span

Browse Source
This commit is contained in:
Dimitris - Rafail Katsampas
2025-01-26 14:58:08 +02:00
committed by Nathan Walker
parent b12c41532a
commit 045986de8f
6 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/core/platforms/android/widgets-release.aar
View File

Binary file not shown.

4
packages/core/ui/styling/font.android.ts
View File

@ -47,7 +47,7 @@ export class Font extends FontBase {
return this._typeface; return this._typeface;
} }
getUIFont(defaultFont: UIFont): UIFont { getUIFont(defaultFont: any): any {
return undefined; return undefined;
} }
} }
@ -121,7 +121,7 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type
function createTypeface(font: Font): android.graphics.Typeface { function createTypeface(font: Font): android.graphics.Typeface {
const fontFamilies = parseFontFamily(font.fontFamily); const fontFamilies = parseFontFamily(font.fontFamily);
const fontWeight = font.fontWeight; const fontWeight = font.fontWeight;
const isNumericFontWeightSupported = SDK_VERSION > 27; const isNumericFontWeightSupported = SDK_VERSION >= 28;
let result: android.graphics.Typeface; let result: android.graphics.Typeface;
let fontStyle: number = 0; let fontStyle: number = 0;

2
packages/core/ui/styling/font.ios.ts
View File

@ -109,7 +109,7 @@ export class Font extends FontBase {
}); });
} }
getAndroidTypeface(): android.graphics.Typeface { getAndroidTypeface(): any {
return undefined; return undefined;
} }
} }

32
packages/core/ui/text-base/index.android.ts
View File

@ -3,7 +3,7 @@ import { getClosestPropertyValue, maxLinesProperty, textOverflowProperty } from
import { ShadowCSSValues } from '../styling/css-shadow'; import { ShadowCSSValues } from '../styling/css-shadow';
// Requires // Requires
import { Font, isFontWeightBold } from '../styling/font'; import { Font } from '../styling/font';
import { backgroundColorProperty } from '../styling/style-properties'; import { backgroundColorProperty } from '../styling/style-properties';
import { TextBaseCommon, formattedTextProperty, textAlignmentProperty, textDecorationProperty, textProperty, textTransformProperty, textShadowProperty, textStrokeProperty, letterSpacingProperty, whiteSpaceProperty, lineHeightProperty, resetSymbol } from './text-base-common'; import { TextBaseCommon, formattedTextProperty, textAlignmentProperty, textDecorationProperty, textProperty, textTransformProperty, textShadowProperty, textStrokeProperty, letterSpacingProperty, whiteSpaceProperty, lineHeightProperty, resetSymbol } from './text-base-common';
import { Color } from '../../color'; import { Color } from '../../color';
@ -593,33 +593,17 @@ function createSpannableStringBuilder(formattedString: FormattedString, defaultF
function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span, start: number, end: number, defaultFontSize: number): void { function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span, start: number, end: number, defaultFontSize: number): void {
const spanStyle = span.style; const spanStyle = span.style;
const bold = isFontWeightBold(spanStyle.fontWeight);
const italic = spanStyle.fontStyle === 'italic';
const align = spanStyle.verticalAlignment; const align = spanStyle.verticalAlignment;
// We set font style using StyleSpan in case the font doesn't support font styles const font = new Font(spanStyle.fontFamily, spanStyle.fontSize, spanStyle.fontStyle, spanStyle.fontWeight, spanStyle.fontScaleInternal, spanStyle.fontVariationSettings);
if (bold && italic) { const typefaceSpan = new org.nativescript.widgets.CustomTypefaceSpan(font.getAndroidTypeface());
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD_ITALIC), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} else if (bold) {
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} else if (italic) {
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.ITALIC), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
const fontFamily = span.fontFamily;
if (fontFamily) {
const font = new Font(fontFamily, 0, spanStyle.fontStyle, spanStyle.fontWeight, spanStyle.fontScaleInternal, spanStyle.fontVariationSettings);
const typeface = font.getAndroidTypeface() || android.graphics.Typeface.create(fontFamily, 0);
const typefaceSpan: android.text.style.TypefaceSpan = new org.nativescript.widgets.CustomTypefaceSpan(fontFamily, typeface);
ssb.setSpan(typefaceSpan, start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(typefaceSpan, start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (spanStyle.fontSize) {
ssb.setSpan(new android.text.style.AbsoluteSizeSpan(layout.toDevicePixels(spanStyle.fontSize)), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
const realFontSize = span.fontSize; const color = spanStyle.color;
if (realFontSize) {
ssb.setSpan(new android.text.style.AbsoluteSizeSpan(realFontSize * layout.getDisplayDensity()), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
const color = span.color;
if (color) { if (color) {
ssb.setSpan(new android.text.style.ForegroundColorSpan(color.android), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(new android.text.style.ForegroundColorSpan(color.android), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
@ -646,7 +630,7 @@ function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span,
if (align) { if (align) {
initializeBaselineAdjustedSpan(); initializeBaselineAdjustedSpan();
ssb.setSpan(new BaselineAdjustedSpan(defaultFontSize * layout.getDisplayDensity(), align), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(new BaselineAdjustedSpan(layout.toDevicePixels(defaultFontSize), align), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
const tappable = span.tappable; const tappable = span.tappable;

2
packages/types-android/src/lib/android/org.nativescript.widgets.d.ts vendored
View File

@ -654,7 +654,7 @@
} }
export class CustomTypefaceSpan extends android.text.style.TypefaceSpan { export class CustomTypefaceSpan extends android.text.style.TypefaceSpan {
constructor(family: string, typeface: android.graphics.Typeface); constructor(typeface: android.graphics.Typeface);
} }
} }
} }

11
packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CustomTypefaceSpan.java
View File

@ -7,15 +7,12 @@ import android.text.style.TypefaceSpan;
/** /**
* Created by hhristov on 2/27/17. * Created by hhristov on 2/27/17.
* Updated by CatchABus on 1/26/25.
*/ */
@SuppressLint("ParcelCreator") @SuppressLint("ParcelCreator")
public class CustomTypefaceSpan extends TypefaceSpan { public class CustomTypefaceSpan extends TypefaceSpan {
private final Typeface typeface; public CustomTypefaceSpan(Typeface typeface) {
super(typeface);
public CustomTypefaceSpan(String family, Typeface typeface) {
super(family);
this.typeface = typeface;
} }
public void updateDrawState(TextPaint ds) { public void updateDrawState(TextPaint ds) {
@ -30,7 +27,7 @@ public class CustomTypefaceSpan extends TypefaceSpan {
final Typeface old = paint.getTypeface(); final Typeface old = paint.getTypeface();
final int oldStyle = (old == null) ? 0 : old.getStyle(); final int oldStyle = (old == null) ? 0 : old.getStyle();
Typeface typeface = this.typeface; Typeface typeface = this.getTypeface();
int fake = oldStyle & ~typeface.getStyle(); int fake = oldStyle & ~typeface.getStyle();
if ((fake & android.graphics.Typeface.BOLD) != 0) { if ((fake & android.graphics.Typeface.BOLD) != 0) {
paint.setFakeBoldText(true); paint.setFakeBoldText(true);