add android icon font support

doric-android/doric/src/main/java/pub/doric/shader/TextNode.java

@@ -20,11 +20,11 @@ import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.TextView;
 
+import com.github.pengfeizhou.jscore.JSValue;
+
 import pub.doric.DoricContext;
 import pub.doric.extension.bridge.DoricPlugin;
 
-import com.github.pengfeizhou.jscore.JSValue;
-
 /**
  * @Description: widget
  * @Author: pengfei.zhou
@@ -76,6 +76,17 @@ public class TextNode extends ViewNode<TextView> {
                 } else {
                     view.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
                 }
+                break;
+            case "font":
+                String font = prop.asString().toString();
+                if (font.endsWith(".ttf")) {
+                    Typeface iconFont = Typeface.createFromAsset(getContext().getAssets(), font);
+                    view.setTypeface(iconFont);
+                } else {
+                    Typeface iconFont = Typeface.createFromAsset(getContext().getAssets(), font + ".ttf");
+                    view.setTypeface(iconFont);
+                }
+
                 break;
             default:
                 super.blend(view, name, prop);

doric-demo/src/TextDemo.ts

@@ -45,6 +45,15 @@ class TextDemo extends Panel {
                         textSize: 30,
                         fontStyle: "bold_italic"
                     }),
+                    text({
+                        text: "This is Icon Font text \ue631",
+                        font: 'iconfont/iconfont.ttf'
+                    }),
+                    text({
+                        text: "This is Icon Font text \ue631",
+                        textSize: 30,
+                        font: 'iconfont/iconfont.ttf'
+                    }),
                 ],
                 {
                     space: 10,

doric-js/bundle/doric-lib.es5.js

@@ -1617,6 +1617,10 @@ var Text = /** @class */ (function (_super) {
         Property,
         __metadata$3("design:type", String)
     ], Text.prototype, "fontStyle", void 0);
+    __decorate$3([
+        Property,
+        __metadata$3("design:type", String)
+    ], Text.prototype, "font", void 0);
     return Text;
 }(View));
 function text(config) {

doric-js/bundle/doric-lib.js

@@ -1201,6 +1201,10 @@ __decorate$3([
     Property,
     __metadata$3("design:type", String)
 ], Text.prototype, "fontStyle", void 0);
+__decorate$3([
+    Property,
+    __metadata$3("design:type", String)
+], Text.prototype, "font", void 0);
 function text(config) {
     const ret = new Text;
     ret.layoutConfig = layoutConfig().fit();

doric-js/bundle/doric-vm.js

@@ -2660,6 +2660,10 @@ __decorate$3([
     Property,
     __metadata$3("design:type", String)
 ], Text.prototype, "fontStyle", void 0);
+__decorate$3([
+    Property,
+    __metadata$3("design:type", String)
+], Text.prototype, "font", void 0);
 function text(config) {
     const ret = new Text;
     ret.layoutConfig = layoutConfig().fit();

doric-js/index.d.ts

@@ -462,6 +462,7 @@ declare module 'doric/lib/src/widget/text' {
         maxLines?: number;
         textAlignment?: Gravity;
         fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
+        font?: string;
     }
     export class Text extends View implements IText {
         text?: string;
@@ -470,6 +471,7 @@ declare module 'doric/lib/src/widget/text' {
         maxLines?: number;
         textAlignment?: Gravity;
         fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
+        font?: string;
     }
     export function text(config: IText): Text;
 }

doric-js/lib/src/widget/text.d.ts

@@ -8,6 +8,7 @@ export interface IText extends IView {
     maxLines?: number;
     textAlignment?: Gravity;
     fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
+    font?: string;
 }
 export declare class Text extends View implements IText {
     text?: string;
@@ -16,5 +17,6 @@ export declare class Text extends View implements IText {
     maxLines?: number;
     textAlignment?: Gravity;
     fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
+    font?: string;
 }
 export declare function text(config: IText): Text;

doric-js/lib/src/widget/text.js

@@ -52,6 +52,10 @@ __decorate([
     Property,
     __metadata("design:type", String)
 ], Text.prototype, "fontStyle", void 0);
+__decorate([
+    Property,
+    __metadata("design:type", String)
+], Text.prototype, "font", void 0);
 export function text(config) {
     const ret = new Text;
     ret.layoutConfig = layoutConfig().fit();

doric-js/src/widget/text.ts

@@ -25,6 +25,7 @@ export interface IText extends IView {
     maxLines?: number
     textAlignment?: Gravity
     fontStyle?: "normal" | "bold" | "italic" | "bold_italic"
+    font?: string
 }
 
 export class Text extends View implements IText {
@@ -45,6 +46,9 @@ export class Text extends View implements IText {
 
     @Property
     fontStyle?: "normal" | "bold" | "italic" | "bold_italic"
+
+    @Property
+    font?: string
 }
 
 export function text(config: IText) {

doric-web/dist/index.js

@@ -2718,6 +2718,10 @@ __decorate$3([
     Property,
     __metadata$3("design:type", String)
 ], Text.prototype, "fontStyle", void 0);
+__decorate$3([
+    Property,
+    __metadata$3("design:type", String)
+], Text.prototype, "font", void 0);
 function text(config) {
     const ret = new Text;
     ret.layoutConfig = layoutConfig().fit();