From 26d0a38357dda3442e075bd6fff3fac6065e1e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B6=9B?= <aquietuncle@gmail.com>
Date: Mon, 25 May 2020 18:08:45 +0800
Subject: [PATCH] feat:android  TextNode  font  support load from res

---
 .../app/src/main/res/font/font_iconfont.ttf   | Bin 0 -> 2108 bytes
 .../main/java/pub/doric/shader/TextNode.java  |  43 ++++++++++++++++--
 doric-demo/bundle/fonts/assets_iconfont.ttf   | Bin 0 -> 2108 bytes
 doric-demo/src/TextDemo.ts                    |  25 +++++++++-
 4 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 doric-android/app/src/main/res/font/font_iconfont.ttf
 create mode 100644 doric-demo/bundle/fonts/assets_iconfont.ttf

diff --git a/doric-android/app/src/main/res/font/font_iconfont.ttf b/doric-android/app/src/main/res/font/font_iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6ea00a93968c042413b0fded35f6c6d7e1b29ecb
GIT binary patch
literal 2108
zcmd^APiP!f9RA+S?##|c+N9~m9@;XSq&aBVY&L(?nrcinQ7F2!Yd{cmx|!Wg+1*(t
z)6zhM1@Yji5j+IVAvZw;BZ8-bIeJjYp&*E@Jw-(dUc5-V@q2IHVod~lcXr?JeZTL0
zzu)`4w{PD-0O&y*Ch`lHUZ30Ue0dKLPm`T{?b29b=98C)=&#XVEH}K?&u@Hnj{c8q
zt!jO>^5;*tJ_XDYV9eBfZ|TGf-*60f*`{kG>^tVW#5dW7YmMl7ih!}VXj1i{?1|IT
zH!sjw4exqO4B%IepP=tHy@vl>sq+qyTxb49D_Ds(Ha_zhDubQ@Yd72bZM>O~K4|4?
z9)1kPkiBUPzw*}6nLp4IYk&A)?iVSH`~7wT#tphD7&=^LGH@Gd<x4iL@cu*NX`IF=
z#EbJ6N{oyX$2Exha@A91$~=N&a#WBJuoRMML;_+RNu-STjc@7Sh<ouH3W7^CkTj+2
z@Kdb3w1nBc@xAeQ{bn0&s`TpRRJxcXq0BKFQ=+6buacGOQTALR`2+@)h9v=e<NI7^
zZ0X0fL&(bi@6Tgu15WB~P<thJioV)?b)LDS`b3pb!y4A{AvUmyEqnp_&nXN%o;hv}
z$<}w=8XTGG8|s@V44e|m$!4+=li+xEaAb0NB0H6pL+8Zg^s{10nm*~pOkp6Cot#b{
zNJqicQ;*1<8Olt^M!o9$lW{S6_A}F&<OF9`RsC0Qwk=0EHa|z4e9Ly&J%E|F9ey4A
zzALS{et(C&WA{2X2_-V_IuE{|jl;HWXZK%W2gRb;Di(K(#m?Ks;=K6Sl1X=DQt^@1
z+1`?~9%x%)CuJQ|1$2H_%HGZ{=a$fQY$@kg6-F*^J0dUHSU`fz-*IZ}Q5ZLV#K}#^
z5^9B;#^9Qo#brEan3Z-m#xWlss$;klpC!7P?ztk9qNmOnF9sW@G&ac(Yn&kFeWcPP
zd8<!qY>|In<20Vcg2p}QM<{QCgu|F8@Ses3z4%;X14r<+#wPjiG)@rT);Ng)+|$@X
zuP`-EV^Q>L+=CIZoIW4=UgR&imsj28a?q><%_!Xk7yathx)*lcZolY<E6YLC9na;v
z)Pmpi!)~6HYt=#&RoqG#G~9V6^y~G&ZH2)VzZ~UiQPes+HYO*Me6Accc;TJrvVC}n
zXqVvPGFEAqQAU6!D#}LG9b_(2U&U3_85<rNJ*Zx!I>ZWfGOLSm<d8oUwLn!<DG%1O
zf@_?uz$zow<g$g#)F7JI75c2CPVAzk#;!0=nd%&`9U0ZaS&Z@1T~Sw`Q!8!AgVKH9
f#qT+FbpBxsVet1nTJ*xG<~M_8$#1mkzLNX}jz=d{

literal 0
HcmV?d00001

diff --git a/doric-android/doric/src/main/java/pub/doric/shader/TextNode.java b/doric-android/doric/src/main/java/pub/doric/shader/TextNode.java
index 65a3d90a..8ebc9fb5 100644
--- a/doric-android/doric/src/main/java/pub/doric/shader/TextNode.java
+++ b/doric-android/doric/src/main/java/pub/doric/shader/TextNode.java
@@ -23,6 +23,8 @@ import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.TextView;
 
+import androidx.core.content.res.ResourcesCompat;
+
 import com.github.pengfeizhou.jscore.JSObject;
 import com.github.pengfeizhou.jscore.JSValue;
 
@@ -30,6 +32,7 @@ import pub.doric.DoricContext;
 import pub.doric.extension.bridge.DoricPlugin;
 import pub.doric.shader.richtext.CustomTagHandler;
 import pub.doric.shader.richtext.HtmlParser;
+import pub.doric.utils.DoricLog;
 import pub.doric.utils.DoricUtils;
 
 /**
@@ -122,12 +125,42 @@ public class TextNode extends ViewNode<TextView> {
                     return;
                 }
                 String font = prop.asString().toString();
-                if (font.endsWith(".ttf")) {
-                    Typeface iconFont = Typeface.createFromAsset(getContext().getAssets(), font);
-                    view.setTypeface(iconFont);
+                String fontPath="";
+                String fontName=font;
+                if(font.contains("/")){
+                    int separatorIndex=font.lastIndexOf("/");
+                    fontPath=font.substring(0,separatorIndex+1);
+                    fontName=font.substring(separatorIndex+1);
+                }
+
+                if (fontName.endsWith(".ttf")) {
+                    fontName = fontName.replace(".ttf","");
+                }
+
+                int resId = getContext().getResources().getIdentifier(
+                        fontName.toLowerCase(),
+                        "font",
+                        getContext().getPackageName());
+                if (resId > 0) {
+                    try {
+                        Typeface iconFont = ResourcesCompat.getFont(getContext(), resId);
+                        view.setTypeface(iconFont);
+                    }catch (Exception e){
+                        DoricLog.e("Error Font asset  "+font+" in res/font");
+                    }
+
                 } else {
-                    Typeface iconFont = Typeface.createFromAsset(getContext().getAssets(), font + ".ttf");
-                    view.setTypeface(iconFont);
+                    fontName = fontPath+
+                            fontName +
+                            ".ttf";
+                    try {
+                        Typeface iconFont = Typeface.createFromAsset(getContext().getAssets(), fontName);
+                        view.setTypeface(iconFont);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                        DoricLog.e(font+" not found in Assets");
+                    }
+
                 }
 
                 break;
diff --git a/doric-demo/bundle/fonts/assets_iconfont.ttf b/doric-demo/bundle/fonts/assets_iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6ea00a93968c042413b0fded35f6c6d7e1b29ecb
GIT binary patch
literal 2108
zcmd^APiP!f9RA+S?##|c+N9~m9@;XSq&aBVY&L(?nrcinQ7F2!Yd{cmx|!Wg+1*(t
z)6zhM1@Yji5j+IVAvZw;BZ8-bIeJjYp&*E@Jw-(dUc5-V@q2IHVod~lcXr?JeZTL0
zzu)`4w{PD-0O&y*Ch`lHUZ30Ue0dKLPm`T{?b29b=98C)=&#XVEH}K?&u@Hnj{c8q
zt!jO>^5;*tJ_XDYV9eBfZ|TGf-*60f*`{kG>^tVW#5dW7YmMl7ih!}VXj1i{?1|IT
zH!sjw4exqO4B%IepP=tHy@vl>sq+qyTxb49D_Ds(Ha_zhDubQ@Yd72bZM>O~K4|4?
z9)1kPkiBUPzw*}6nLp4IYk&A)?iVSH`~7wT#tphD7&=^LGH@Gd<x4iL@cu*NX`IF=
z#EbJ6N{oyX$2Exha@A91$~=N&a#WBJuoRMML;_+RNu-STjc@7Sh<ouH3W7^CkTj+2
z@Kdb3w1nBc@xAeQ{bn0&s`TpRRJxcXq0BKFQ=+6buacGOQTALR`2+@)h9v=e<NI7^
zZ0X0fL&(bi@6Tgu15WB~P<thJioV)?b)LDS`b3pb!y4A{AvUmyEqnp_&nXN%o;hv}
z$<}w=8XTGG8|s@V44e|m$!4+=li+xEaAb0NB0H6pL+8Zg^s{10nm*~pOkp6Cot#b{
zNJqicQ;*1<8Olt^M!o9$lW{S6_A}F&<OF9`RsC0Qwk=0EHa|z4e9Ly&J%E|F9ey4A
zzALS{et(C&WA{2X2_-V_IuE{|jl;HWXZK%W2gRb;Di(K(#m?Ks;=K6Sl1X=DQt^@1
z+1`?~9%x%)CuJQ|1$2H_%HGZ{=a$fQY$@kg6-F*^J0dUHSU`fz-*IZ}Q5ZLV#K}#^
z5^9B;#^9Qo#brEan3Z-m#xWlss$;klpC!7P?ztk9qNmOnF9sW@G&ac(Yn&kFeWcPP
zd8<!qY>|In<20Vcg2p}QM<{QCgu|F8@Ses3z4%;X14r<+#wPjiG)@rT);Ng)+|$@X
zuP`-EV^Q>L+=CIZoIW4=UgR&imsj28a?q><%_!Xk7yathx)*lcZolY<E6YLC9na;v
z)Pmpi!)~6HYt=#&RoqG#G~9V6^y~G&ZH2)VzZ~UiQPes+HYO*Me6Accc;TJrvVC}n
zXqVvPGFEAqQAU6!D#}LG9b_(2U&U3_85<rNJ*Zx!I>ZWfGOLSm<d8oUwLn!<DG%1O
zf@_?uz$zow<g$g#)F7JI75c2CPVAzk#;!0=nd%&`9U0ZaS&Z@1T~Sw`Q!8!AgVKH9
f#qT+FbpBxsVet1nTJ*xG<~M_8$#1mkzLNX}jz=d{

literal 0
HcmV?d00001

diff --git a/doric-demo/src/TextDemo.ts b/doric-demo/src/TextDemo.ts
index d8176a33..fa63029d 100644
--- a/doric-demo/src/TextDemo.ts
+++ b/doric-demo/src/TextDemo.ts
@@ -46,14 +46,35 @@ class TextDemo extends Panel {
                         fontStyle: "bold_italic"
                     }),
                     text({
-                        text: "This is Icon Font text \ue631",
+                        text: "Icon Font text from   \ue631 ",
+                        textSize: 10,
                         font: 'iconfont'
                     }),
                     text({
-                        text: "This is Icon Font text \ue631",
+                        text: "Icon Font text from   \ue631 ",
                         textSize: 30,
                         font: 'iconfont'
                     }),
+                    text({
+                        text: "Icon Font text from res/font/  \ue631 ",
+                        textSize: 10,
+                        font: 'font_iconfont'
+                    }),
+                    text({
+                        text: "Icon Font text from res/font/  \ue631 ",
+                        textSize: 30,
+                        font: 'font_iconfont.ttf'
+                    }),
+                    text({
+                        text: "Icon Font text from assets/fonts/  \ue631 ",
+                        textSize: 10,
+                        font: 'fonts/assets_iconfont'
+                    }),
+                    text({
+                        text: "Icon Font text from assets/fonts/  \ue631 ",
+                        textSize: 30,
+                        font: 'fonts/assets_iconfont.ttf'
+                    }),
                     text({
                         text: "This is line Spaceing 0,\nSecond line",
                         maxLines: 0,