ActionBarCommon新增属性

goweii · Sep 1, 2019 · 9a69177 · 9a69177
1 parent fed132e
commit 9a69177
Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/actionbarex-common/src/main/java/per/goweii/actionbarex/common/ActionBarCommon.java b/actionbarex-common/src/main/java/per/goweii/actionbarex/common/ActionBarCommon.java
@@ -8,7 +8,9 @@
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -28,6 +30,7 @@ public final class ActionBarCommon extends ActionBarEx {
     private int leftIconRes;
     private int leftIconColor;
     private int leftIconPadding;
+    private int leftIconMarginLeft;
     private String rightText;
     private float rightTextSize;
     private int rightTextColor;
@@ -36,6 +39,7 @@ public final class ActionBarCommon extends ActionBarEx {
     private int rightIconRes;
     private int rightIconColor;
     private int rightIconPadding;
+    private int rightIconMarginRight;
     private String titleText;
     private float titleTextSize;
     private int titleTextColor;
@@ -113,6 +117,7 @@ protected void initAttrs(AttributeSet attrs) {
         leftIconRes = typedArray.getResourceId(R.styleable.ActionBarCommon_abc_leftIconRes, 0);
         leftIconColor = typedArray.getColor(R.styleable.ActionBarCommon_abc_leftIconColor, iconColorDef);
         leftIconPadding = (int) typedArray.getDimension(R.styleable.ActionBarCommon_abc_leftIconPadding, iconPaddingDef);
+        leftIconMarginLeft = (int) typedArray.getDimension(R.styleable.ActionBarCommon_abc_leftIconMarginLeft, 0);
 
         rightText = typedArray.getString(R.styleable.ActionBarCommon_abc_rightText);
         rightTextSize = typedArray.getDimension(R.styleable.ActionBarCommon_abc_rightTextSize, textSizeDef);
@@ -122,6 +127,7 @@ protected void initAttrs(AttributeSet attrs) {
         rightIconRes = typedArray.getResourceId(R.styleable.ActionBarCommon_abc_rightIconRes, 0);
         rightIconColor = typedArray.getColor(R.styleable.ActionBarCommon_abc_rightIconColor, iconColorDef);
         rightIconPadding = (int) typedArray.getDimension(R.styleable.ActionBarCommon_abc_rightIconPadding, iconPaddingDef);
+        rightIconMarginRight = (int) typedArray.getDimension(R.styleable.ActionBarCommon_abc_rightIconMarginRight, 0);
 
         titleText = typedArray.getString(R.styleable.ActionBarCommon_abc_titleText);
         titleTextSize = typedArray.getDimension(R.styleable.ActionBarCommon_abc_titleTextSize, titleTextSizeDef);
@@ -141,6 +147,9 @@ protected View inflateTitleBar() {
         rightTextView = titleBarChild.findViewById(R.id.tv_right);
         rightIconView = titleBarChild.findViewById(R.id.iv_right);
 
+        LinearLayout.LayoutParams leftIconViewParams = (LinearLayout.LayoutParams) leftIconView.getLayoutParams();
+        leftIconViewParams.leftMargin = leftIconMarginLeft;
+        leftIconView.setLayoutParams(leftIconViewParams);
         if (leftIconRes > 0) {
             leftIconView.setVisibility(VISIBLE);
             leftIconView.setPadding(leftIconPadding, leftIconPadding, leftIconPadding, leftIconPadding);
@@ -182,6 +191,9 @@ public void onClick(View v) {
         titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleTextSize);
         titleTextView.setMaxWidth(titleTextMaxWidth);
 
+        LinearLayout.LayoutParams rightIconViewParams = (LinearLayout.LayoutParams) rightIconView.getLayoutParams();
+        rightIconViewParams.rightMargin = rightIconMarginRight;
+        rightIconView.setLayoutParams(rightIconViewParams);
         if (rightIconRes > 0) {
             rightIconView.setVisibility(VISIBLE);
             rightIconView.setPadding(rightIconPadding, rightIconPadding, rightIconPadding, rightIconPadding);

diff --git a/actionbarex-common/src/main/res/values/attrs.xml b/actionbarex-common/src/main/res/values/attrs.xml
@@ -12,6 +12,7 @@
         <attr name="abc_leftIconRes" format="reference" />
         <attr name="abc_leftIconColor" format="color|reference" />
         <attr name="abc_leftIconPadding" format="dimension|reference" />
+        <attr name="abc_leftIconMarginLeft" format="dimension|reference" />
         <attr name="abc_rightText" format="string|dimension" />
         <attr name="abc_rightTextSize" format="dimension|reference" />
         <attr name="abc_rightTextColor" format="color|reference" />
@@ -20,6 +21,7 @@
         <attr name="abc_rightIconRes" format="reference" />
         <attr name="abc_rightIconColor" format="color|reference" />
         <attr name="abc_rightIconPadding" format="dimension|reference" />
+        <attr name="abc_rightIconMarginRight" format="dimension|reference" />
         <attr name="abc_titleText" format="string|reference" />
         <attr name="abc_titleTextSize" format="dimension|reference" />
         <attr name="abc_titleTextColor" format="color|reference" />