[new] 修改readme

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

@@ -11,6 +11,12 @@
     <com.qimai.android.widgetlib.topbar.QmTopBar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
+            app:title_color="@color/colorPrimary"
+            app:title_text_size="@dimen/QmTopBar_dp_18"
+            app:right_drawable_id="@drawable/more"
+            app:right_text="确定"
+            app:need_separator="true"
+            app:right_text_color="@color/colorAccent"
             app:title_text="详情"
             android:layout_height="45dp"/>
 

tools/src/main/java/com/qimai/android/tools/DpTools.kt

@@ -3,7 +3,7 @@ package com.qimai.android.tools
 import android.content.Context
 
 
-fun dipTopx(context: Context, dp: Int): Int {
+fun dipTopx(context: Context, dp: Float): Int {
     val scale = context.resources.displayMetrics.density
     return (dp * scale + 0.5f).toInt()
 }

widgetlib/TopBarReadMe.MD

@@ -3,8 +3,47 @@
  接入方法
  
  ````
+ 
  ````
  
+ 用法
+ ```
+ <com.qimai.android.widgetlib.topbar.QmTopBar
+            android:id="@+id/toolbar" 
+            android:layout_width="match_parent"
+            app:title_color="@color/colorPrimary"
+            app:title_text_size="@dimen/QmTopBar_dp_18"
+            app:right_drawable_id="@drawable/more"
+            app:right_text="确定"
+            app:need_separator="true"
+            app:right_text_color="@color/colorAccent"
+            app:title_text="详情"
+            android:layout_height="45dp"/>
+            
+            
+ ///-----------------------------------------
+      // 是否需要分割线
+      <attr name="need_separator" format="boolean"/>
+
+        <attr name="separator_color" format="color"/>
+        <attr name="separator_height" format="dimension"/>
+        <!-- titlebar背景颜色-->
+        <attr name="bg_color" format="color"/>
+        // 返回按钮的图片
+        <attr name="left_back_drawable_id" format="reference"/>
+        // title 相关
+        <attr name="title_text_size" format="dimension"/>
+        <attr name="title_color" format="color"/>
+        <attr name="title_text" format="string"/>
+         // 右边按钮相关
+        <attr name="right_drawable_id" format="reference"/>
+        
+        //  右边文案相关
+        <attr name="right_text" format="string"/>
+        <attr name="right_text_color" format="color"/>
+        <attr name="right_text_size" format="dimension"/>
+        <attr name="right_text_background" format="reference"/>            
+ ```
  
  
  

widgetlib/src/main/java/com/qimai/android/widgetlib/topbar/QmTopBar.kt

@@ -180,7 +180,7 @@ class QmTopBar : Toolbar {
             leftImageViewParams.addRule(RelativeLayout.ALIGN_LEFT)
 
             leftImageViewParams.addRule(RelativeLayout.CENTER_VERTICAL)
-            leftImageViewParams.leftMargin = dipTopx(context, 16)
+            leftImageViewParams.leftMargin = dipTopx(context, 16f)
             relativeLayout.addView(view, leftImageViewParams)
             relativeLayout.removeView(leftImageView)
             return
@@ -206,7 +206,7 @@ class QmTopBar : Toolbar {
             mRightImg.setImageResource(qmTopBarRightDrawable)
             rightImgParams.addRule(RelativeLayout.CENTER_VERTICAL)
             rightImgParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT)
-            rightImgParams.rightMargin = dipTopx(context, 16)
+            rightImgParams.rightMargin = dipTopx(context, 16f)
             relativeLayout.addView(mRightImg, rightImgParams)
             registerRightImgListener()
         }
@@ -232,7 +232,7 @@ class QmTopBar : Toolbar {
             rightTextParams.addRule(RelativeLayout.CENTER_VERTICAL)
         } else {
             rightTextParams.addRule(RelativeLayout.CENTER_VERTICAL)
-            rightTextParams.marginEnd = dipTopx(context, 16)
+            rightTextParams.marginEnd = dipTopx(context, 16f)
             rightTextParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT)
         }
         mRightTextView.setPadding(15, 5, 15, 5)
@@ -288,7 +288,8 @@ class QmTopBar : Toolbar {
         // 下划线
         if (qmTopBarNeedSeparator && !::lineView.isInitialized) {
             lineView = View(context)
-            val lineParams = RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, dipTopx(context, 1))
+            val lineParams =
+                RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, dipTopx(context, 0.5f))
             lineView.setBackgroundColor(ContextCompat.getColor(context, R.color.QmTopBar_color_999999))
             lineParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
             relativeLayout.addView(lineView, lineParams)
@@ -306,13 +307,13 @@ class QmTopBar : Toolbar {
         leftImageView.setImageDrawable(ContextCompat.getDrawable(context, qmTopBarLeftDrawable))
         leftImageView.id = View.generateViewId()
         val leftImageViewParams = RelativeLayout.LayoutParams(
-            dipTopx(context, 16),
-            dipTopx(context, 16)
+            dipTopx(context, 16f),
+            dipTopx(context, 16f)
         )
         leftImageViewParams.addRule(RelativeLayout.ALIGN_LEFT)
 
         leftImageViewParams.addRule(RelativeLayout.CENTER_VERTICAL)
-        leftImageViewParams.leftMargin = dipTopx(context, 16)
+        leftImageViewParams.leftMargin = dipTopx(context, 16f)
         relativeLayout.addView(leftImageView, leftImageViewParams)
     }
 

widgetlib/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="QmTopBar_color_999999">#999999</color>
+    <color name="QmTopBar_color_999999">#C0BEBE</color>
     <color name="QmTopBar_color_FFFFFFF">#FFFFFF</color>
     <color name="QmTopBar_color_3333333">#333333</color>
     <color name="QmTopBar_color_000000">#000000</color>