升级字体库版本

app/src/main/java/com/xuexiang/xuidemo/MyApp.java

@@ -62,7 +62,7 @@ private void initUI() {
         XUI.init(this);
         XUI.debug(MyApp.isDebug());
 //        //设置默认字体为华文行楷
-//        XUI.getInstance().initFontStyle("fonts/hwxk.ttf");
+        XUI.getInstance().initFontStyle("fonts/hwxk.ttf");
         PictureFileUtils.setAppName("xui");
 
         //字体图标库

app/src/main/java/com/xuexiang/xuidemo/activity/MainActivity.java

@@ -14,6 +14,7 @@
 import com.umeng.analytics.MobclickAgent;
 import com.xuexiang.xui.utils.ResUtils;
 import com.xuexiang.xui.utils.ThemeUtils;
+import com.xuexiang.xui.utils.WidgetUtils;
 import com.xuexiang.xui.widget.dialog.DialogLoader;
 import com.xuexiang.xui.widget.guidview.GuideCaseQueue;
 import com.xuexiang.xui.widget.guidview.GuideCaseView;
@@ -112,6 +113,8 @@ private void initTab() {
         expand.setIcon(SettingSPUtils.getInstance().isUseCustomTheme() ? R.drawable.custom_selector_icon_tabbar_expand : R.drawable.selector_icon_tabbar_expand);
         mTabLayout.addTab(expand);
 
+        WidgetUtils.setTabLayoutTextFont(mTabLayout);
+
         switchPage(ComponentsFragment.class);
 
         mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {

app/src/main/java/com/xuexiang/xuidemo/base/BaseActivity.java

@@ -15,7 +15,7 @@
 
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
+import io.github.inflationx.viewpump.ViewPumpContextWrapper;
 
 /**
  * 基础容器Activity
@@ -44,7 +44,7 @@ public class BaseActivity extends XPageActivity {
     @Override
     protected void attachBaseContext(Context newBase) {
         //注入字体
-        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+        super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
     }
 
     @Override

app/src/main/java/com/xuexiang/xuidemo/fragment/components/TextViewFragment.java

@@ -4,6 +4,7 @@
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.base.ComponentContainerFragment;
 import com.xuexiang.xuidemo.fragment.components.textview.AutoFitTextViewFragment;
+import com.xuexiang.xuidemo.fragment.components.textview.AutoHyphenationTextViewFragment;
 import com.xuexiang.xuidemo.fragment.components.textview.BadgeViewFragment;
 import com.xuexiang.xuidemo.fragment.components.textview.ExpandableTextViewFragment;
 import com.xuexiang.xuidemo.fragment.components.textview.GroupListViewFragment;
@@ -27,7 +28,8 @@ public Class[] getPagesClasses() {
                 ExpandableTextViewFragment.class,
                 LabelViewFragment.class,
                 BadgeViewFragment.class,
-                AutoFitTextViewFragment.class
+                AutoFitTextViewFragment.class,
+                AutoHyphenationTextViewFragment.class
         };
     }
 

app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tablayout/TabLayoutCacheFragment.java

@@ -30,6 +30,7 @@
 import com.google.android.material.tabs.TabLayout;
 import com.xuexiang.xaop.annotation.SingleClick;
 import com.xuexiang.xpage.annotation.Page;
+import com.xuexiang.xui.utils.WidgetUtils;
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.base.BaseFragment;
 import com.xuexiang.xuidemo.fragment.components.tabbar.tabsegment.MultiPage;
@@ -129,7 +130,8 @@ private void refreshAdapter(boolean isShow) {
                 mAdapter.addFragment(SimpleTabFragment.newInstance(page), page);
             }
             mAdapter.notifyDataSetChanged();
-            viewPager.setCurrentItem(0);
+            viewPager.setCurrentItem(0, false);
+            WidgetUtils.setTabLayoutTextFont(tabLayout);
         } else {
             mAdapter.clear();
         }

app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tablayout/TabLayoutSimpleFragment.java

@@ -22,6 +22,7 @@
 import com.google.android.material.tabs.TabLayout;
 import com.xuexiang.xpage.annotation.Page;
 import com.xuexiang.xui.adapter.FragmentAdapter;
+import com.xuexiang.xui.utils.WidgetUtils;
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.base.BaseFragment;
 import com.xuexiang.xuidemo.fragment.components.tabbar.tabsegment.MultiPage;
@@ -67,6 +68,10 @@ protected void initViews() {
         mTabLayout.addOnTabSelectedListener(this);
         mViewPager.setAdapter(adapter);
         mTabLayout.setupWithViewPager(mViewPager);
+
+        WidgetUtils.setTabLayoutTextFont(mTabLayout);
+        WidgetUtils.setTabLayoutTextFont(mTabLayout1);
+
     }
 
     @Override

app/src/main/java/com/xuexiang/xuidemo/fragment/components/textview/AutoHyphenationTextViewFragment.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2020 xuexiangjys(xuexiangjys@163.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.xuexiang.xuidemo.fragment.components.textview;
+
+import com.xuexiang.xpage.annotation.Page;
+import com.xuexiang.xuidemo.R;
+import com.xuexiang.xuidemo.base.BaseFragment;
+
+/**
+ * @author xuexiang
+ * @since 2020/5/20 1:15 AM
+ */
+@Page(name = "自动断字换行文本")
+public class AutoHyphenationTextViewFragment extends BaseFragment {
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_auto_hyphenation_textview;
+    }
+
+    @Override
+    protected void initViews() {
+
+
+    }
+}

app/src/main/res/layout/fragment_auto_hyphenation_textview.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2020 xuexiangjys(xuexiangjys@163.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:breakStrategy="high_quality"
+        android:hyphenationFrequency="full"
+        android:text="@string/large_text" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name">XUIDemo</string>
     <string name="app_browser_name">XUI浏览器</string>
     <!--华文行楷字体路径，其实可以不设置-->
-    <!--<string name="default_app_font_path">fonts/hwxk.ttf</string>-->
+    <string name="default_app_font_path">fonts/hwxk.ttf</string>
 
     <string name="style_default">默认样式</string>
     <string name="style_md_ios">Material Design &#038; iOS Style</string>

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

xui_lib/build.gradle

@@ -18,13 +18,14 @@ android {
 }
 
 dependencies {
-    compileOnly deps.androidx.appcompat
+    implementation deps.androidx.appcompat
     compileOnly deps.androidx.recyclerview
     compileOnly deps.androidx.design
 
     compileOnly deps.glide
 
-    api 'uk.co.chrisjenx:calligraphy:2.3.0'
+    api 'io.github.inflationx:calligraphy3:3.1.1'
+    api 'io.github.inflationx:viewpump:2.0.3'
 }
 
 apply from: '../JitPackUpload.gradle'

xui_lib/src/main/java/com/xuexiang/xui/XUI.java

@@ -11,8 +11,10 @@
 
 import com.xuexiang.xui.logs.UILog;
 
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
-import uk.co.chrisjenx.calligraphy.TypefaceUtils;
+import io.github.inflationx.calligraphy3.CalligraphyConfig;
+import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
+import io.github.inflationx.calligraphy3.TypefaceUtils;
+import io.github.inflationx.viewpump.ViewPump;
 
 /**
  * UI全局设置
@@ -30,6 +32,8 @@ public class XUI {
 
     private static int sScreenType;
 
+    private static String sDefaultFontAssetPath;
+
     private XUI() {
 
     }
@@ -51,6 +55,7 @@ public static XUI getInstance() {
     }
 
     //=======================初始化设置===========================//
+
     /**
      * 初始化
      *
@@ -64,10 +69,16 @@ public static void init(Application context) {
      * 设置默认字体
      */
     public XUI initFontStyle(String defaultFontAssetPath) {
-        CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
-                .setDefaultFontPath(defaultFontAssetPath)
-                .setFontAttrId(R.attr.fontPath)
-                .build());
+        if (!TextUtils.isEmpty(defaultFontAssetPath)) {
+            sDefaultFontAssetPath = defaultFontAssetPath;
+            ViewPump.init(ViewPump.builder()
+                    .addInterceptor(new CalligraphyInterceptor(
+                            new CalligraphyConfig.Builder()
+                                    .setDefaultFontPath(defaultFontAssetPath)
+                                    .setFontAttrId(R.attr.fontPath)
+                                    .build()))
+                    .build());
+        }
         return this;
     }
 
@@ -83,6 +94,7 @@ private static void testInitialize() {
     }
 
     //=======================日志调试===========================//
+
     /**
      * 设置调试模式
      *
@@ -104,14 +116,14 @@ public static void debug(boolean isDebug) {
     }
 
     //=======================字体===========================//
+
     /**
      * @return 获取默认字体
      */
     @Nullable
     public static Typeface getDefaultTypeface() {
-        String fontPath = CalligraphyConfig.get().getFontPath();
-        if (!TextUtils.isEmpty(fontPath)) {
-            return TypefaceUtils.load(getContext().getAssets(), fontPath);
+        if (!TextUtils.isEmpty(sDefaultFontAssetPath)) {
+            return TypefaceUtils.load(getContext().getAssets(), sDefaultFontAssetPath);
         }
         return null;
     }
@@ -123,7 +135,7 @@ public static Typeface getDefaultTypeface() {
     @Nullable
     public static Typeface getDefaultTypeface(String fontPath) {
         if (TextUtils.isEmpty(fontPath)) {
-            fontPath = CalligraphyConfig.get().getFontPath();
+            fontPath = sDefaultFontAssetPath;
         }
         if (!TextUtils.isEmpty(fontPath)) {
             return TypefaceUtils.load(getContext().getAssets(), fontPath);
@@ -135,6 +147,7 @@ public static Typeface getDefaultTypeface(String fontPath) {
 
     /**
      * 检验设备屏幕的尺寸
+     *
      * @param context
      * @return
      */
@@ -154,6 +167,7 @@ private static int checkScreenSize(Context context) {
 
     /**
      * 判断是否平板设备
+     *
      * @return true:平板,false:手机
      */
     public static int getScreenType() {
@@ -167,6 +181,7 @@ public static int getScreenType() {
 
     /**
      * 是否是平板
+     *
      * @return
      */
     public static boolean isTablet() {
@@ -175,13 +190,14 @@ public static boolean isTablet() {
 
     /**
      * 初始化主题
+     *
      * @param activity
      */
     public static void initTheme(Activity activity) {
         int screenType = getScreenType();
         if (screenType == UIConsts.ScreenType.PHONE) {
             activity.setTheme(R.style.XUITheme_Phone);
-        } else if (screenType == UIConsts.ScreenType.SMALL_TABLET){
+        } else if (screenType == UIConsts.ScreenType.SMALL_TABLET) {
             activity.setTheme(R.style.XUITheme_Tablet_Small);
         } else {
             activity.setTheme(R.style.XUITheme_Tablet_Big);

xui_lib/src/main/java/com/xuexiang/xui/utils/WidgetUtils.java

@@ -19,17 +19,23 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.tabs.TabLayout;
 import com.xuexiang.xui.R;
+import com.xuexiang.xui.XUI;
 import com.xuexiang.xui.adapter.recyclerview.DividerItemDecoration;
 import com.xuexiang.xui.adapter.recyclerview.GridDividerItemDecoration;
 import com.xuexiang.xui.adapter.recyclerview.XGridLayoutManager;
@@ -94,6 +100,42 @@ public static void setSpinnerDropDownVerticalOffset(Spinner spinner) {
         }
     }
 
+    //===============TabLayout=============//
+
+    /**
+     * 设置TabLayout选项卡的字体
+     *
+     * @param tabLayout 选项卡
+     */
+    public static void setTabLayoutTextFont(TabLayout tabLayout) {
+        setTabLayoutTextFont(tabLayout, XUI.getDefaultTypeface());
+    }
+
+    /**
+     * 设置TabLayout选项卡的字体
+     *
+     * @param tabLayout 选项卡
+     * @param typeface  字体
+     */
+    public static void setTabLayoutTextFont(TabLayout tabLayout, Typeface typeface) {
+        if (tabLayout == null || typeface == null) {
+            return;
+        }
+        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+        int tabsCount = vg.getChildCount();
+        for (int i = 0; i < tabsCount; i++) {
+            ViewGroup vgTab = (ViewGroup) vg.getChildAt(i);
+            int tabCount = vgTab.getChildCount();
+            for (int j = 0; j < tabCount; j++) {
+                View tabViewChild = vgTab.getChildAt(j);
+                if (tabViewChild instanceof TextView) {
+                    ((TextView) tabViewChild).setTypeface(typeface, Typeface.NORMAL);
+                }
+            }
+        }
+    }
+
+
     //===============recyclerView=============//
 
     /**