Merge pull request #18 from Jilberta/master

Added Label Text Styles to the Library.
linger1216 · Feb 9, 2017 · fa16bdc · fa16bdc
2 parents 010aafc + 4949539
commit fa16bdc
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 3 deletions.
diff --git a/app/src/main/java/com/lid/labelview/ListViewActivity.java b/app/src/main/java/com/lid/labelview/ListViewActivity.java
@@ -1,6 +1,7 @@
 package com.lid.labelview;
 
 import android.content.Context;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.view.View;
@@ -42,6 +43,7 @@ public View getItemView(int position, View convertView, ViewHolder holder) {
             LabelImageView imageView = holder.getView(R.id.image);
             imageView.setImageResource(Integer.parseInt(item.image));
             imageView.setLabelText("LID " + position);
+            imageView.setLabelTextStyle(Typeface.BOLD);
 
             return convertView;
         }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -28,7 +28,8 @@
     app:label_height="20dp"
     app:label_orientation="RIGHT_TOP"
     app:label_text="HD"
-    app:label_textSize="12sp" />
+    app:label_textSize="12sp"
+    app:label_textStyle="BOLD"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -44,7 +45,8 @@
                 android:src="@mipmap/image1"
                 app:label_backgroundColor="#C2185B"
                 app:label_orientation="LEFT_TOP"
-                app:label_text="CHINA" />
+                app:label_text="CHINA"
+                app:label_textStyle="ITALIC"/>
 
 
             <com.lid.lib.LabelImageView
@@ -75,7 +77,8 @@
     app:label_distance="15dp"
     app:label_orientation="LEFT_TOP"
     app:label_text="POP"
-    app:label_textSize="10sp" />
+    app:label_textSize="10sp"
+    app:label_textStyle="BOLD_ITALIC"/>
 
 
         <com.lid.lib.LabelButtonView

diff --git a/lib/src/main/java/com/lid/lib/LabelButtonView.java b/lib/src/main/java/com/lid/lib/LabelButtonView.java
@@ -91,6 +91,14 @@ public int getLabelTextSize() {
     public void setLabelTextSize(int textSize) {
         utils.setLabelTextSize(this, textSize);
     }
+
+    public int getLabelTextStyle(){
+        return utils.getLabelTextStyle();
+    }
+
+    public void setLabelTextStyle(int textStyle){
+        utils.setLabelTextStyle(this, textStyle);
+    }
 }
 
 
diff --git a/lib/src/main/java/com/lid/lib/LabelImageView.java b/lib/src/main/java/com/lid/lib/LabelImageView.java
@@ -95,6 +95,14 @@ public int getLabelTextSize() {
     public void setLabelTextSize(int textSize) {
         utils.setLabelTextSize(this, textSize);
     }
+
+    public int getLabelTextStyle(){
+        return utils.getLabelTextStyle();
+    }
+
+    public void setLabelTextStyle(int textStyle){
+        utils.setLabelTextStyle(this, textStyle);
+    }
 }
 
 
diff --git a/lib/src/main/java/com/lid/lib/LabelTextView.java b/lib/src/main/java/com/lid/lib/LabelTextView.java
@@ -91,6 +91,14 @@ public int getLabelTextSize() {
     public void setLabelTextSize(int textSize) {
         utils.setLabelTextSize(this, textSize);
     }
+
+    public int getLabelTextStyle(){
+        return utils.getLabelTextStyle();
+    }
+
+    public void setLabelTextStyle(int textStyle){
+        utils.setLabelTextStyle(this, textStyle);
+    }
 }
 
 
diff --git a/lib/src/main/java/com/lid/lib/LabelViewHelper.java b/lib/src/main/java/com/lid/lib/LabelViewHelper.java
@@ -7,6 +7,7 @@
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -26,6 +27,7 @@ public class LabelViewHelper {
     private static final int DEFAULT_STROKE_COLOR = 0xFFFFFFFF;
     private static final int DEFAULT_TEXT_COLOR = 0xFFFFFFFF;
     private static final int DEFAULT_ORIENTATION = LEFT_TOP;
+    private static final int DEFAULT_TEXT_STYLE = 0;
 
     private int distance;
     private int height;
@@ -34,6 +36,7 @@ public class LabelViewHelper {
     private int backgroundColor;
     private int strokeColor;
     private int textSize;
+    private int textStyle;
     private int textColor;
     private boolean visual;
     private int orientation;
@@ -66,6 +69,7 @@ public LabelViewHelper(Context context, AttributeSet attrs, int defStyleAttr) {
         backgroundColor = attributes.getColor(R.styleable.LabelView_label_backgroundColor, DEFAULT_BACKGROUND_COLOR);
         strokeColor = attributes.getColor(R.styleable.LabelView_label_strokeColor, DEFAULT_STROKE_COLOR);
         textSize = attributes.getDimensionPixelSize(R.styleable.LabelView_label_textSize, dip2Px(DEFAULT_TEXT_SIZE));
+        textStyle = attributes.getInt(R.styleable.LabelView_label_textStyle, DEFAULT_TEXT_STYLE);
         textColor = attributes.getColor(R.styleable.LabelView_label_textColor, DEFAULT_TEXT_COLOR);
         visual = attributes.getBoolean(R.styleable.LabelView_label_visual, true);
         orientation = attributes.getInteger(R.styleable.LabelView_label_orientation, DEFAULT_ORIENTATION);
@@ -118,6 +122,7 @@ public void onDraw(Canvas canvas, int measuredWidth, int measuredHeight) {
         textPaint.setTextSize(textSize);
         textPaint.setColor(textColor);
         textPaint.getTextBounds(text, 0, text.length(), textBound);
+        textPaint.setTypeface(Typeface.defaultFromStyle(textStyle));
 
         float begin_w_offset = (1.4142135f * actualDistance) / 2 - textBound.width() / 2;
         if (begin_w_offset < 0) begin_w_offset = 0;
@@ -322,4 +327,14 @@ public void setLabelTextSize(View view, int textSize) {
             view.invalidate();
         }
     }
+
+    public int getLabelTextStyle(){
+        return textStyle;
+    }
+
+    public void setLabelTextStyle(View view, int textStyle){
+        if(this.textStyle == textStyle) return;
+        this.textStyle = textStyle;
+        view.invalidate();
+    }
 }
diff --git a/lib/src/main/res/values/attr.xml b/lib/src/main/res/values/attr.xml
@@ -8,6 +8,12 @@
         <attr name="label_strokeColor" format="color"/>
         <attr name="label_text" format="string"/>
         <attr name="label_textSize" format="dimension" />
+        <attr name="label_textStyle" format="enum" >
+            <enum name="NORMAL" value="0"/>
+            <enum name="BOLD" value="1"/>
+            <enum name="ITALIC" value="2"/>
+            <enum name="BOLD_ITALIC" value="3"/>
+        </attr>
         <attr name="label_textColor" format="color"/>
         <attr name="label_visual" format="boolean"/>
         <attr name="label_orientation" format="enum">