#update Toolbar 默认17sp

MirkoWu · Jul 16, 2021 · 0e5cafd · 0e5cafd
1 parent 5099479
commit 0e5cafd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 18 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,9 +11,10 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:showLine="true"
         android:background="#FFFFFF"
-        app:title="@string/app_name" />
+        app:showLine="true"
+        app:title="@string/app_name"
+        app:titleTextSize="18sp" />
 
     <com.mirkowu.lib_widget.NoScrollViewPager
         android:id="@+id/vp_home"

diff --git a/lib_image/src/main/java/com/mirkowu/lib_image/ImageLoader.java b/lib_image/src/main/java/com/mirkowu/lib_image/ImageLoader.java
@@ -15,10 +15,17 @@
 
 import java.io.File;
 
+/**
+ * 图片加载器
+ * 支持自定义加载库
+ */
 public class ImageLoader {
 
     private volatile static ILoader sILoader;
 
+    private ImageLoader() {
+    }
+
     /**
      * 设置加载引擎
      *
@@ -30,6 +37,7 @@ public static void setLoader(ILoader loader) {
 
     /**
      * 默认用 Glide
+     *
      * @return
      */
     public static ILoader getLoader() {

diff --git a/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java b/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java
@@ -7,6 +7,7 @@
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -35,6 +36,7 @@ public class Toolbar extends RelativeLayout {
     private View vLine;
     private boolean mShowLine;
     private int mTitleColorId;
+    private int mTitleTextSize;
     private int mRightColorId;
     private Drawable mBackIconDrawable;
     private Drawable mCloseIconDrawable;
@@ -60,6 +62,8 @@ private void init(Context context, AttributeSet attrs) {
         TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.Toolbar);
         String title = ta.getString(R.styleable.Toolbar_title);
         mTitleColorId = ta.getColor(R.styleable.Toolbar_titleColor, Color.parseColor("#222222"));
+        mTitleTextSize = ta.getDimensionPixelSize(R.styleable.Toolbar_titleTextSize, SizeUtils.dp2px(17f));
+        // int mTextSizeUnit = ta.peekValue(R.styleable.Toolbar_titleTextSize).getComplexUnit();
         mRightColorId = ta.getColor(R.styleable.Toolbar_rightColor, Color.parseColor("#333333"));
         mBackIconDrawable = ta.getDrawable(R.styleable.Toolbar_backIcon);
         mCloseIconDrawable = ta.getDrawable(R.styleable.Toolbar_closeIcon);
@@ -77,6 +81,7 @@ private void init(Context context, AttributeSet attrs) {
 
         setTitle(title);
         setTitleColor(mTitleColorId);
+        setTitleTextSize(TypedValue.COMPLEX_UNIT_PX, mTitleTextSize);
         setRightTextColor(mRightColorId);
         setBackIcon(mBackIconDrawable);
         setCloseIcon(mCloseIconDrawable);
@@ -103,6 +108,26 @@ public Toolbar setTitle(String title) {
         return this;
     }
 
+
+    public Toolbar setTitle(@StringRes int titleResId) {
+        tvTitle.setText(titleResId);
+        return this;
+    }
+
+    public Toolbar setTitleColor(@ColorInt int colorId) {
+        tvTitle.setTextColor(colorId);
+        return this;
+    }
+
+    public Toolbar setTitleTextSize(int sizeSp) {
+        return setTitleTextSize(TypedValue.COMPLEX_UNIT_SP, sizeSp);
+    }
+
+    public Toolbar setTitleTextSize(int unit, float size) {
+        tvTitle.setTextSize(unit, size);
+        return this;
+    }
+
     /**
      * 设置标题缩略格式 或 跑马灯
      *
@@ -120,21 +145,6 @@ public Toolbar setTitleEllipsize(TextUtils.TruncateAt where) {
         return this;
     }
 
-    public Toolbar setTitle(@StringRes int titleResId) {
-        tvTitle.setText(titleResId);
-        return this;
-    }
-
-    public Toolbar setTitleColor(@ColorInt int colorId) {
-        tvTitle.setTextColor(colorId);
-        return this;
-    }
-
-    public Toolbar setTitleSize(int sizeSp) {
-        tvTitle.setTextSize(sizeSp);
-        return this;
-    }
-
     public Toolbar setShowBackIcon(boolean isShow) {
         if (isShow) {
             setBackIcon(mBackIconDrawable);

diff --git a/lib_widget/src/main/res/layout/widget_layout_toolbar.xml b/lib_widget/src/main/res/layout/widget_layout_toolbar.xml
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textColor="#222222"
-        android:textSize="16sp"
+        android:textSize="17sp"
         tools:text="标题" />
 
 

diff --git a/lib_widget/src/main/res/values/attrs.xml b/lib_widget/src/main/res/values/attrs.xml
@@ -9,6 +9,7 @@
     <declare-styleable name="Toolbar">
         <attr name="title" format="string" />
         <attr name="titleColor" format="color" />
+        <attr name="titleTextSize" format="dimension" />
         <attr name="titleEllipsize" format="enum">
             <enum name="start" value="0" />
             <enum name="middle" value="1" />