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

Load fonts from file instead of asset. Fixes fonts loading in ION and livesync

Browse Source
This commit is contained in:
vakrilov
2015-12-14 16:36:38 +02:00
parent d0e1766b42
commit fdf9c923ad
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/styling/font.android.ts
View File

@ -7,7 +7,7 @@ import fs = require("file-system");
var typefaceCache = new Map<string, android.graphics.Typeface>(); var typefaceCache = new Map<string, android.graphics.Typeface>();
var appAssets: android.content.res.AssetManager; var appAssets: android.content.res.AssetManager;
var FONTS_BASE_PATH = "app/fonts/"; var FONTS_BASE_PATH = "/fonts/";
export class Font extends common.Font { export class Font extends common.Font {
public static default = new Font(undefined, undefined, enums.FontStyle.normal, enums.FontWeight.normal); public static default = new Font(undefined, undefined, enums.FontStyle.normal, enums.FontWeight.normal);
@ -88,11 +88,6 @@ export class Font extends common.Font {
} }
private loadFontFromAsset(fontFamily: string): android.graphics.Typeface { private loadFontFromAsset(fontFamily: string): android.graphics.Typeface {
appAssets = appAssets || application.android.context.getAssets();
if (!appAssets) {
return null;
}
var result = typefaceCache.get(fontFamily); var result = typefaceCache.get(fontFamily);
// Check for undefined explicitly as null mean we tried to load the font, but failed. // Check for undefined explicitly as null mean we tried to load the font, but failed.
if (types.isUndefined(result)) { if (types.isUndefined(result)) {
@ -111,7 +106,8 @@ export class Font extends common.Font {
if (fontAssetPath) { if (fontAssetPath) {
try { try {
result = android.graphics.Typeface.createFromAsset(appAssets, fontAssetPath); fontAssetPath = fs.path.join(fs.knownFolders.currentApp().path, fontAssetPath);
result = android.graphics.Typeface.createFromFile(fontAssetPath)
} catch (e) { } catch (e) {
trace.write("Error loading font asset: " + fontAssetPath, trace.categories.Error, trace.messageType.error); trace.write("Error loading font asset: " + fontAssetPath, trace.categories.Error, trace.messageType.error);
} }