support custom suffix and prefix, fix #5

Author: daimajia

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+'
     }
 }

demo/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 8

demo/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="NumberProgressBar"
         android:theme="@style/AppTheme" >
         <activity
             android:name="com.daimajia.numberprogressbar.example.MainActivity"

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

@@ -17,7 +17,6 @@
         android:layout_width="wrap_content"
         android:padding="20dp"
         custom:progress="0"
-        custom:progress_text_visibility="invisible"
         style="@style/NumberProgressBar_Default"
         android:layout_height="wrap_content" />
 

library/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 8

library/src/main/AndroidManifest.xml

@@ -1,11 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.daimajia.numberprogressbar">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
->
-
-    </application>
-
 </manifest>

library/src/main/java/com/daimajia/numberprogressbar/NumberProgressBar.java

@@ -58,6 +58,16 @@ public class NumberProgressBar extends View {
      */
     private float mUnreachedBarHeight;
 
+    /**
+     * the suffix of the number.
+     */
+    private String mSuffix = "%";
+
+    /**
+     * the prefix.
+     */
+    private String mPrefix = "";
+
 
     private final int default_text_color = Color.rgb(66, 145, 241);
     private final int default_reached_color = Color.rgb(66,145,241);
@@ -276,7 +286,8 @@ private void calculateDrawRectFWithoutProgressText(){
 
     private void calculateDrawRectF(){
 
-        mCurrentDrawText = String.format("%d%%",getProgress()*100/getMax());
+        mCurrentDrawText = String.format("%d" ,getProgress()*100/getMax());
+        mCurrentDrawText = mPrefix + mCurrentDrawText + mSuffix;
         mDrawTextWidth = mTextPaint.measureText(mCurrentDrawText);
 
         if(getProgress() == 0){
@@ -382,6 +393,22 @@ public void setMax(int Max) {
         }
     }
 
+    public void setSuffix(String suffix){
+        if(suffix == null){
+            mSuffix = "";
+        }else{
+            mSuffix = suffix;
+        }
+    }
+
+    public void setPrefix(String prefix){
+        if(prefix == null)
+            mPrefix = "";
+        else{
+            mPrefix = prefix;
+        }
+    }
+
     public void incrementProgressBy(int by){
         if(by > 0){
             setProgress(getProgress() + by);